Date: Fri, 3 Apr 2020 14:50:09 -0400
Subject: [PATCH 4/8] add Hotmail mailbox name uniqueness constraint
(bot-stopper)
---
app/models/user.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 883719f2..d23c2d2b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -352,7 +352,9 @@ class User < ApplicationRecord
def set_unique_email
user, domain = self.email.split('@')
user = user.split('+').first
- user = user.gsub('.', '') if domain == 'gmail.com'
+ if ((domain == 'gmail.com') || (domain == 'hotmail.com'))
+ user = user.gsub('.', '')
+ end
self.unique_email = "#{user}@#{domain}"
end
end
From 745e8af84e94123cc16ea24c71ec3dccd1c7d8b3 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Sun, 12 Apr 2020 12:14:58 -0400
Subject: [PATCH 5/8] Updated legal docs
---
app/views/about/privacy.html.haml | 6 ++-
app/views/about/sales.html.haml | 5 ++-
app/views/about/terms.html.haml | 62 +++++++++++++++----------------
3 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/app/views/about/privacy.html.haml b/app/views/about/privacy.html.haml
index 9e8b0b9f..d8f7ff1a 100644
--- a/app/views/about/privacy.html.haml
+++ b/app/views/about/privacy.html.haml
@@ -5,14 +5,16 @@
.box-widget
.rich-formatting
%h1 GAB AI INC
- %h2 PRIVACY POLICY
- %h3 DATE: 24 JUNE 2019
+ %h2 Privacy Policy
+ %h3 Last Updated: 10 April 2020
%p GAB AI INC (”Company” or “We”) respect your privacy and are committed to protecting it through our compliance with this policy.
%p
This policy describes the types of information we may collect from you or that you may provide when you visit the website
= link_to 'GAB.COM', 'https://gab.com'
,
+ = link_to 'ON.GAB.COM', 'https://ongab.com'
+ ,
= link_to 'DISSENTER.COM', 'https://dissenter.com'
and any other online properties of Gab AI Inc (each a “Website”) and our practices for collecting, using, maintaining, protecting, and disclosing that information.
diff --git a/app/views/about/sales.html.haml b/app/views/about/sales.html.haml
index ac14cce0..1c2f4964 100644
--- a/app/views/about/sales.html.haml
+++ b/app/views/about/sales.html.haml
@@ -4,8 +4,11 @@
.content
.box-widget
.rich-formatting
+ %h1 GAB AI INC
%h2 Terms of Sale
- %p Gab AI Inc (“We” or “Gab”) hereby allow you to access certain premium features or content in exchange for a one-time or recurring fee, as applicable to the relevant features or content, such as our “GabPro” enhanced social media offering (collectively, each a “Paid Service” and collectively the "Paid Services"). Your transactions and any other use of the Paid Services are subject to these Gab Paid Service Terms of Service ("Terms”).
+ %h3 Last Updated: 10 April 2020
+
+ %p Gab AI Inc (“We” or “Gab”) hereby allow you to access certain premium features or content in exchange for a one-time or recurring fee, as applicable to the relevant features or content, such as our “GabPro” enhanced social media offering, our Dissenter Shop, or On Gab web teleconferencing service (each a “Paid Service” and collectively the "Paid Services"). Your transactions and any other use of the Paid Services are subject to these Gab Paid Service Terms of Sale ("Terms”).
%h3 1. Your Acceptance
%p
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
index 97525514..76378ab6 100644
--- a/app/views/about/terms.html.haml
+++ b/app/views/about/terms.html.haml
@@ -5,21 +5,21 @@
.box-widget
.rich-formatting
%h1 GAB AI INC
- %h2 Website Terms of Use
- %h3 Last Modified: 24 June 2019
+ %h2 Website Terms of Service
+ %h3 Last Updated: 10 April 2020
- %h3 Acceptance of the Terms of Use
+ %h3 Acceptance of the Terms of Service
%p
These terms of use are entered into by and between You and GAB AI INC (”Company,” “we,” or “us”). The following terms and conditions, together with the
= link_to 'Copyright Policy', about_dmca_path
, the
= link_to 'Privacy Policy', about_privacy_path
- and any other documents expressly incorporated by reference (collectively, “Terms of Use”), govern your access to and use of GAB.COM and DISSENTER.COM and other web properties of Gab AI Inc, including any content, functionality, and services offered on or through GAB.COM and DISSENTER.COM (the “Website”), whether as a guest or a registered user.
+ and any other documents expressly incorporated by reference (collectively, “Terms of Service”), govern your access to and use of GAB.COM, ONGAB.COM and DISSENTER.COM and other web properties of Gab AI Inc, including any content, functionality, and services offered on or through GAB.COM, ONGAB.COM and DISSENTER.COM (the “Website”), whether as a guest or a registered user.
%p
- Please read the Terms of Use carefully before you start to use the Website. By using the Website, you accept and agree to be bound and abide by these Terms of Use and our
+ Please read the Terms of Service carefully before you start to use the Website. By using the Website, you accept and agree to be bound and abide by these Terms of Service and our
= link_to 'Privacy Policy', about_privacy_path
- , incorporated herein by reference. If you do not want to agree to these Terms of Use or the
+ , incorporated herein by reference. If you do not want to agree to these Terms of Service or the
= link_to 'Privacy Policy', about_privacy_path
, you must not access or use the Website.
%p This Website is offered and available to users who are 18 years of age or older. By using this Website, you represent and warrant that you are of legal age to form a binding contract with the Company and meet all of the foregoing eligibility requirements. If you do not meet all of these requirements, you must not access or use the Website.
@@ -30,10 +30,10 @@
= link_to 'Privacy Policy', about_privacy_path
, and
= link_to 'Copyright Policy', about_dmca_path
- which are incorporated into these Terms of Use by reference.
+ which are incorporated into these Terms of Service by reference.
- %h3 Changes to the Terms of Use
- %p We may revise and update these Terms of Use from time to time in our sole discretion. All changes are effective immediately when we post them, and apply to all access to and use of the Website thereafter. Your continued use of the Website following the posting of revised Terms of Use means that you accept and agree to the changes. You are expected to check this page frequently so you are aware of any changes, as they are binding on you.
+ %h3 Changes to the Terms of Service
+ %p We may revise and update these Terms of Service from time to time in our sole discretion. All changes are effective immediately when we post them, and apply to all access to and use of the Website thereafter. Your continued use of the Website following the posting of revised Terms of Service means that you accept and agree to the changes. You are expected to check this page frequently so you are aware of any changes, as they are binding on you.
%h3 Accessing the Website and Account Security
@@ -42,7 +42,7 @@
%p You are responsible for both:
%ul
%li Making all arrangements necessary for you to have access to the Website.
- %li Ensuring that all persons who access the Website through your internet connection are aware of these Terms of Use and comply with them.
+ %li Ensuring that all persons who access the Website through your internet connection are aware of these Terms of Service and comply with them.
%p
To access the Website or some of the resources it offers, you may be asked to provide certain registration details or other information. It is a condition of your use of the Website that all the information you provide on the Website is correct, current, and complete. You agree that all information you provide to register with this Website or otherwise, including, but not limited to, through the use of any interactive features on the Website, is governed by our
@@ -50,11 +50,11 @@
, and you consent to all actions we take with respect to your information consistent with our
= link_to 'Privacy Policy.', about_privacy_path
%p If you choose, or are provided with, a user name, password, or any other piece of information as part of our security procedures, you must treat such information as confidential, and you must not disclose it to any other person or entity. You also acknowledge that your account is personal to you and agree not to provide any other person with access to this Website or portions of it using your user name, password, or other security information. You agree to notify us immediately of any unauthorized access to or use of your user name or password or any other breach of security. You should use particular caution when accessing your account from a public or shared computer so that others are not able to view or record your password or other personal information.
- %p We have the right to disable any user name, password, or other identifier, whether chosen by you or provided by us, at any time if we believe you have violated any provision of these Terms of Use.
+ %p We have the right to disable any user name, password, or other identifier, whether chosen by you or provided by us, at any time if we believe you have violated any provision of these Terms of Service.
%h3 Intellectual Property Rights
%p The Website and its entire contents, features, and functionality (including but not limited to all information, software, text, displays, images, video, and audio, and the design, selection, and arrangement thereof) are owned by the Company, its licensors, or other providers of such material and are protected by United States and international copyright, trademark, patent, trade secret, and other intellectual property or proprietary rights laws. A copy of the Gab Social social networking software (“Gab Social”) and the AGPL license applicable thereto may be found at our public repository.
- %p These Terms of Use permit you to use the Website for your personal, non-commercial use only. You must not reproduce, distribute, modify, create derivative works of, publicly display, publicly perform, republish, download, store, or transmit any of the material on our Website, except as follows:
+ %p These Terms of Service permit you to use the Website for your personal, non-commercial use only. You must not reproduce, distribute, modify, create derivative works of, publicly display, publicly perform, republish, download, store, or transmit any of the material on our Website, except as follows:
%ul
%li You may use Gab Social software subject to the terms of the Affero GPL License, Version 3.
@@ -62,7 +62,7 @@
%li You may store files that are automatically cached by your Web browser for display enhancement purposes.
%li You may print or download one copy of a reasonable number of pages of the Website for your own personal, non-commercial use and not for further reproduction, publication, or distribution.
%li If we provide desktop, mobile, or other applications for download, you may download one copy to each of your computers or mobile devices solely for your own personal use, provided you agree to be bound by our end user license agreement for such applications.
- %li Where we provide social media features with certain content on Gab.com and Dissenter.com, you may take such actions as are enabled by such features.
+ %li Where we provide social media features with certain content on Gab.com, OnGab.com and Dissenter.com, you may take such actions as are enabled by such features.
%p You must not:
%ul
@@ -70,17 +70,17 @@
%li Delete or alter any copyright, trademark, or other proprietary rights notices from copies of materials from this site.
%p If you wish to make any use of material on the Website other than that set out in this section, please address your request to: legal [at] gab [dot] com.
- %p If you print, copy, modify, download, or otherwise use or provide any other person with access to any part of the Website in breach of the Terms of Use, your right to use the Website will stop immediately and you must, at our option, return or destroy any copies of the materials you have made. No right, title, or interest in or to the Website or any content on the Website is transferred to you, and all rights not expressly granted are reserved by the Company. Any use of the Website not expressly permitted by these Terms of Use is a breach of these Terms of Use and may violate copyright, trademark, and other laws.
+ %p If you print, copy, modify, download, or otherwise use or provide any other person with access to any part of the Website in breach of the Terms of Service, your right to use the Website will stop immediately and you must, at our option, return or destroy any copies of the materials you have made. No right, title, or interest in or to the Website or any content on the Website is transferred to you, and all rights not expressly granted are reserved by the Company. Any use of the Website not expressly permitted by these Terms of Service is a breach of these Terms of Service and may violate copyright, trademark, and other laws.
%h3 Trademarks
%p The Company name, the terms “GAB”, “GAB.COM,” “DISSENTER,” “COMMENT SECTION OF THE INTERNET,” the GAB and GAB.COM logos, and all related names, logos, product and service names, designs, and slogans are trademarks of the Company or its affiliates or licensors. You must not use such marks without the prior written permission of the Company. All other names, logos, product and service names, designs, and slogans on this Website are the trademarks of their respective owners.
%h3 Prohibited Uses
- %p You may use the Website only for lawful purposes and in accordance with these Terms of Use. You agree not to use the Website:
+ %p You may use the Website only for lawful purposes and in accordance with these Terms of Service. You agree not to use the Website:
%ul
%li In any way that would violate any applicable federal, state, or local law of the United States of America (including, without limitation, any laws regarding the export of data or software to and from the US or other countries) and is not protected by the First Amendment to the U.S. Constitution (the “First Amendment”).
%li For the purpose of exploiting, harming, or attempting to exploit or harm minors in any way by exposing them to inappropriate content, asking for personally identifiable information, or otherwise.
- %li To send, knowingly receive, upload, download, use, or re-use any material that does not comply with the Content Standards set out in these Terms of Use.
+ %li To send, knowingly receive, upload, download, use, or re-use any material that does not comply with the Content Standards set out in these Terms of Service.
%li To transmit, or procure the sending of, any unwanted advertising or promotional material, including any “junk mail,” “chain letter,” “spam,” tagging random users in posts on your timeline, follower spam, or any other similar solicitation. For avoidance of doubt, this is not thought to encompass reasonable commercial use of a Gab feed by a commercial entity or individual to advertise your own commercial products.
%li To impersonate or attempt to impersonate the Company or a Company employee, or to impersonate another user or any other person or entity for a purpose that is not protected by the First Amendment.
%li To engage in any other conduct which, as determined by us, may result in the physical harm or offline harassment of the Company, individual users of the Website or any other person (e.g. “doxing”), or expose them to liability.
@@ -89,7 +89,7 @@
%ul
%li Use the Website in any manner that could disable, overburden, damage, or impair the site or interfere with any other party’s use of the Website, including their ability to engage in real time activities through the Website.
%li Use any robot, spider, or other automatic device, process, or means to access the Website for any purpose, including monitoring or copying any of the material on the Website.
- %li Use any manual process to monitor or copy any of the material on the Website, or for any other purpose not expressly authorized in these Terms of Use, without our prior written consent.
+ %li Use any manual process to monitor or copy any of the material on the Website, or for any other purpose not expressly authorized in these Terms of Service, without our prior written consent.
%li Use any device, software, or routine that interferes with the proper working of the Website.
%li Introduce any viruses, Trojan horses, worms, logic bombs, or other material that is malicious or technologically harmful.
%li Attempt to gain unauthorized access to, interfere with, damage, or disrupt any parts of the Website, the server on which the Website is stored, or any server, computer, or database connected to the Website.
@@ -98,12 +98,12 @@
%h3 User Contributions
%p The Website may contain message boards, chat rooms, personal web pages or profiles, forums, bulletin boards, group pages, discussion threads, and other interactive features (collectively, “Interactive Services”) that allow users to post, submit, publish, display, or transmit to other users or other persons (hereinafter, “post”) content or materials (collectively, “User Contributions”) on or through the Website.
- %p All User Contributions must comply with the Content Standards set out in these Terms of Use. Any User Contribution you post to the site will be considered non-confidential and non-proprietary. By providing any User Contribution on the Website, you grant us and our affiliates and service providers, and each of their and our licensees, successors, and assigns the right to use, reproduce, modify, perform, display, distribute, and otherwise disclose to third parties any such material for any purpose.
+ %p All User Contributions must comply with the Content Standards set out in these Terms of Service. Any User Contribution you post to the site will be considered non-confidential and non-proprietary. By providing any User Contribution on the Website, you grant us and our affiliates and service providers, and each of their and our licensees, successors, and assigns an irrevocable, perpetual, royalty-free right to use, republish, reproduce, modify, perform, display, distribute, and otherwise disclose to third parties any such material for any purpose.
%p You represent and warrant that:
%ul
%li You own or control all rights in and to the User Contributions and have the right to grant the license granted above to us and our affiliates and service providers, and each of their and our respective licensees, successors, and assigns.
- %li All of your User Contributions do and will comply with these Terms of Use.
+ %li All of your User Contributions do and will comply with these Terms of Service.
%p You understand and acknowledge that you are responsible for any User Contributions you submit or contribute, and you, not the Company, have full responsibility for such content, including its legality, reliability, accuracy, and appropriateness.
%p We are not responsible or liable to any third party for the content or accuracy of any User Contributions posted by you or any other user of the Website.
@@ -112,9 +112,9 @@
%p We strive to ensure that the First Amendment remains the Website’s standard for content moderation. We will make best efforts to ensure that all content moderation decisions and enforcement of these terms of service does not punish users for exercising their God-given right to speak freely.
%p We collect comparatively little data on our users relative to other social networking sites. Our default position is that we should implement no prior restraints on any User Contribution. However, given the breadth of speech we permit, there may be circumstances where we are unable to determine whether content is protected by the First Amendment or not and prudence may require us to err on the side of caution. Accordingly, the Company reserves the right to take any action with respect to any User Contribution that we deem necessary or appropriate in our sole discretion, including the following:
%ul
- %li Take any action with respect to any User Contribution that we deem necessary or appropriate in our sole discretion, including if we believe that such User Contribution violates the Terms of Use, including the Content Standards, infringes any intellectual property right or other right of any person or entity, or could threaten the physical safety of users of the Website or the public.
+ %li Take any action with respect to any User Contribution that we deem necessary or appropriate in our sole discretion, including if we believe that such User Contribution violates the Terms of Service, including the Content Standards, infringes any intellectual property right or other right of any person or entity, or could threaten the physical safety of users of the Website or the public.
%li Take appropriate legal action, including without limitation referral to law enforcement, for any illegal or unauthorized use of the Website or in cases of life-threatening emergency.
- %li Terminate or suspend your access to all or part of the Website for any violation of these Terms of Use.
+ %li Terminate or suspend your access to all or part of the Website for any violation of these Terms of Service.
%p If your access to the Website is terminated or suspended in relation to a User Contribution authored by you that you believe constitutes protected political or religious speech, and you are able to demonstrate that the User Contribution in question was protected by the First Amendment by obtaining a declaratory judgment from a court of competent jurisdiction, the company will consider permitting you to re-join the site.
%p It is the policy of the Company to not provide any user data to any person unless compelled by a court order issued by a U.S. court, except in cases of life-threatening emergency. The Company reserves the right to change or deviate from this policy at any time, in its sole and absolute discretion, with or without notice to you. Without limiting the foregoing, we have the right to cooperate fully with any law enforcement authorities or civil and criminal court orders requesting or directing us to disclose the identity or other information of anyone posting any materials on or through the Website. YOU WAIVE AND HOLD HARMLESS THE COMPANY AND ITS AFFILIATES, LICENSEES, AND SERVICE PROVIDERS FROM ANY CLAIMS RESULTING FROM ANY ACTION TAKEN BY ANY OF THE FOREGOING PARTIES DURING, OR TAKEN AS A CONSEQUENCE OF, INVESTIGATIONS BY EITHER SUCH PARTIES OR LAW ENFORCEMENT AUTHORITIES.
%p We do not review material before it is posted on the Website and cannot ensure prompt removal of unlawful material after it has been posted. Accordingly, we assume no liability for any action or inaction regarding transmissions, communications, or content provided by any user or third party. We have no liability or responsibility to anyone for performance or nonperformance of the activities described in this section.
@@ -131,7 +131,7 @@
%li Be obscene, sexually explicit or pornographic. Note that mere nudity e.g. as a form of protest or for educational/medical reasons will not fall foul of this rule.
%li Infringe any patent, trademark, trade secret, copyright, or other intellectual property or other rights of any other person.
%li
- Violate the legal rights (including the rights of publicity and privacy) of others or contain any material that could give rise to any civil or criminal liability under applicable laws or regulations of the United States or that otherwise may be in conflict with these Terms of Use and our
+ Violate the legal rights (including the rights of publicity and privacy) of others or contain any material that could give rise to any civil or criminal liability under applicable laws or regulations of the United States or that otherwise may be in conflict with these Terms of Service and our
= link_to 'Privacy Policy.', about_privacy_path
%li Impersonate any person, or misrepresent your identity or affiliation with any person or organization, for a purpose not protected by the First Amendment.
%li Involve commercial activities relating to finance, investments or gambling, such as contests and sweepstakes, penny stock promotion, money transmission, or Initial Coin Offerings; or the trade of live or endangered animals or animal parts, or anything that portrays or encourages the abuse of animals.
@@ -164,7 +164,7 @@
%p
All purchases through our site or other transactions for the sale of services formed through the Website, or resulting from visits made by you, are governed by our
= link_to 'Terms of Sale.', about_sales_path
- %p Additional terms and conditions may also apply to specific portions, services, or features of the Website. All such additional terms and conditions are hereby incorporated by this reference into these Terms of Use.
+ %p Additional terms and conditions may also apply to specific portions, services, or features of the Website. All such additional terms and conditions are hereby incorporated by this reference into these Terms of Service.
%h3 Linking to the Website and Social Media Features
%p You may link to the Website, provided you do so in a way that is fair and legal and does not damage our reputation or take advantage of it, but you must not establish a link in such a way as to suggest any form of association, approval, or endorsement on our part without our express written consent.
@@ -176,7 +176,7 @@
%li Cause limited portions of content on this Website to be displayed or appear to be displayed on your own or certain third-party websites.
%p You may use these features solely as they are provided by us, solely with respect to the content they are displayed with, and otherwise in accordance with any additional terms and conditions we provide with respect to such features.
- %p The website from which you are linking, or on which you make certain content accessible, must comply in all respects with the Content Standards set out in these Terms of Use.
+ %p The website from which you are linking, or on which you make certain content accessible, must comply in all respects with the Content Standards set out in these Terms of Service.
%p You agree to cooperate with us in causing any unauthorized framing or linking immediately to stop. We reserve the right to withdraw linking permission without notice. We may disable all or any social media features and any links at any time without notice in our discretion.
%h3 Links from the Website
@@ -195,25 +195,25 @@
%p TO THE FULLEST EXTENT PROVIDED BY LAW, IN NO EVENT WILL THE COMPANY, ITS AFFILIATES, OR THEIR LICENSORS, SERVICE PROVIDERS, EMPLOYEES, AGENTS, OFFICERS, OR DIRECTORS BE LIABLE FOR DAMAGES OF ANY KIND, UNDER ANY LEGAL THEORY, ARISING OUT OF OR IN CONNECTION WITH YOUR USE, OR INABILITY TO USE, THE WEBSITE, ANY WEBSITES LINKED TO IT, ANY CONTENT ON THE WEBSITE OR SUCH OTHER WEBSITES, INCLUDING ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR PUNITIVE DAMAGES, INCLUDING BUT NOT LIMITED TO, PERSONAL INJURY, PAIN AND SUFFERING, EMOTIONAL DISTRESS, LOSS OF REVENUE, LOSS OF PROFITS, LOSS OF BUSINESS OR ANTICIPATED SAVINGS, LOSS OF USE, LOSS OF GOODWILL, LOSS OF DATA, AND WHETHER CAUSED BY TORT (INCLUDING NEGLIGENCE), BREACH OF CONTRACT, OR OTHERWISE, EVEN IF FORESEEABLE.THE FOREGOING DOES NOT AFFECT ANY LIABILITY THAT CANNOT BE EXCLUDED OR LIMITED UNDER APPLICABLE LAW.
%h3 Indemnification
- %p You agree to defend, indemnify, and hold harmless the Company, its affiliates, licensors, and service providers, and its and their respective officers, directors, employees, contractors, agents, licensors, suppliers, successors, and assigns from and against any claims, liabilities, damages, judgments, awards, losses, costs, expenses, or fees (including reasonable attorneys’ fees) arising out of or relating to your violation of these Terms of Use or your use of the Website, including, but not limited to, your User Contributions, any use of the Website’s content, services, and products other than as expressly authorized in these Terms of Use, or your use of any information obtained from the Website.
+ %p You agree to defend, indemnify, and hold harmless the Company, its affiliates, licensors, and service providers, and its and their respective officers, directors, employees, contractors, agents, licensors, suppliers, successors, and assigns from and against any claims, liabilities, damages, judgments, awards, losses, costs, expenses, or fees (including reasonable attorneys’ fees) arising out of or relating to your violation of these Terms of Service or your use of the Website, including, but not limited to, your User Contributions, any use of the Website’s content, services, and products other than as expressly authorized in these Terms of Service, or your use of any information obtained from the Website.
%h3 Governing Law and Jurisdiction
- %p All matters relating to the Website and these Terms of Use, and any dispute or claim arising therefrom or related thereto (in each case, including non-contractual disputes or claims), shall be governed by and construed in accordance with the internal laws of the State of Pennsylvania without giving effect to any choice or conflict of law provision or rule (whether of the State of Pennsylvania or any other jurisdiction).
- %p Any legal suit, action, or proceeding arising out of, or related to, these Terms of Use or the Website shall be instituted exclusively in the federal courts of the United States or the courts of the State of Pennsylvania, in each case located in the City of Scranton and Lackawanna County, although we retain the right to bring any suit, action, or proceeding against you for breach of these Terms of Use in your state or country of residence or any other relevant jurisdiction. You waive any and all objections to the exercise of jurisdiction over you by such courts and to venue in such courts.
+ %p All matters relating to the Website and these Terms of Service, and any dispute or claim arising therefrom or related thereto (in each case, including non-contractual disputes or claims), shall be governed by and construed in accordance with the internal laws of the State of Pennsylvania without giving effect to any choice or conflict of law provision or rule (whether of the State of Pennsylvania or any other jurisdiction).
+ %p Any legal suit, action, or proceeding arising out of, or related to, these Terms of Service or the Website shall be instituted exclusively in the federal courts of the United States or the courts of the State of Pennsylvania, in each case located in the City of Scranton and Lackawanna County, although we retain the right to bring any suit, action, or proceeding against you for breach of these Terms of Service in your state or country of residence or any other relevant jurisdiction. You waive any and all objections to the exercise of jurisdiction over you by such courts and to venue in such courts.
%h3 Arbitration
- %p At Company’s sole discretion, it may require you to submit any disputes arising from these Terms of Use or use of the Website, including disputes arising from or concerning their interpretation, violation, invalidity, non-performance, or termination, to final and binding arbitration under the Rules of Arbitration of the American Arbitration Association applying Pennsylvania law.
+ %p At Company’s sole discretion, it may require you to submit any disputes arising from these Terms of Service or use of the Website, including disputes arising from or concerning their interpretation, violation, invalidity, non-performance, or termination, to final and binding arbitration under the Rules of Arbitration of the American Arbitration Association applying Pennsylvania law.
%h3 Limitation on Time to File Claims
%p ANY CAUSE OF ACTION OR CLAIM YOU MAY HAVE ARISING OUT OF OR RELATING TO THESE TERMS OF USE OR THE WEBSITE MUST BE COMMENCED WITHIN ONE (1) YEAR AFTER THE CAUSE OF ACTION ACCRUES; OTHERWISE, SUCH CAUSE OF ACTION OR CLAIM IS PERMANENTLY BARRED.
%h3 Waiver and Severability
- %p No waiver by the Company of any term or condition set out in these Terms of Use shall be deemed a further or continuing waiver of such term or condition or a waiver of any other term or condition, and any failure of the Company to assert a right or provision under these Terms of Use shall not constitute a waiver of such right or provision.
- %p If any provision of these Terms of Use is held by a court or other tribunal of competent jurisdiction to be invalid, illegal, or unenforceable for any reason, such provision shall be eliminated or limited to the minimum extent such that the remaining provisions of the Terms of Use will continue in full force and effect.
+ %p No waiver by the Company of any term or condition set out in these Terms of Service shall be deemed a further or continuing waiver of such term or condition or a waiver of any other term or condition, and any failure of the Company to assert a right or provision under these Terms of Service shall not constitute a waiver of such right or provision.
+ %p If any provision of these Terms of Service is held by a court or other tribunal of competent jurisdiction to be invalid, illegal, or unenforceable for any reason, such provision shall be eliminated or limited to the minimum extent such that the remaining provisions of the Terms of Service will continue in full force and effect.
%h3 Entire Agreement
%p
- The Terms of Use, our
+ The Terms of Service, our
= link_to 'Privacy Policy', about_privacy_path
, our
= link_to 'Copyright Policy', about_dmca_path
From d16ef95681a818fdbfabf12d22d20f1293c75139 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 24 Apr 2020 13:19:04 -0400
Subject: [PATCH 6/8] Added investor copy
---
app/views/about/investors.html.haml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/views/about/investors.html.haml b/app/views/about/investors.html.haml
index 7b116e65..388f374b 100644
--- a/app/views/about/investors.html.haml
+++ b/app/views/about/investors.html.haml
@@ -5,6 +5,7 @@
.box-widget
.rich-formatting
%h2 Investors
+ %p The Company is relying on the temporary final rules providing Relief for Form ID Filers and Regulation Crowdfunding and Regulation A Issuers Related to Coronavirus Disease 2019 (COVID-19). The Company is unable to timely file due to reduced capacity of service providers assisting with the preparation of our 2020 Annual Report.
%p
= link_to '2018 Annual Report', 'https://www.sec.gov/Archives/edgar/data/1709244/000114420419021378/tv519744_annualreport.pdf'
%p
From f3c3a66e6bd13088301de8d86652b550d085cae5 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Sat, 9 May 2020 23:57:38 -0400
Subject: [PATCH 7/8] Removed unread_count from group_accounts
---
app/controllers/api/v1/groups_controller.rb | 2 +-
app/controllers/api/v1/timelines/group_controller.rb | 6 ------
.../gabsocial/features/groups/sidebar_panel/item.js | 6 ------
app/models/concerns/group_interactions.rb | 7 -------
app/models/group_account.rb | 2 +-
app/models/list_account.rb | 2 +-
app/models/status.rb | 5 +----
app/presenters/group_relationships_presenter.rb | 3 +--
app/serializers/rest/group_relationship_serializer.rb | 5 +----
...200510034822_remove_unread_count_from_group_accounts.rb | 5 +++++
db/schema.rb | 6 +++---
11 files changed, 14 insertions(+), 35 deletions(-)
create mode 100644 db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb
diff --git a/app/controllers/api/v1/groups_controller.rb b/app/controllers/api/v1/groups_controller.rb
index f59db12c..eaf0bc1c 100644
--- a/app/controllers/api/v1/groups_controller.rb
+++ b/app/controllers/api/v1/groups_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::GroupsController < Api::BaseController
when 'featured'
@groups = Group.where(is_featured: true).limit(50).all
when 'member'
- @groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account }).order('group_accounts.unread_count DESC, group_accounts.id DESC').all
+ @groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account }).order('group_accounts.id DESC').all
when 'admin'
@groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account, role: :admin }).all
end
diff --git a/app/controllers/api/v1/timelines/group_controller.rb b/app/controllers/api/v1/timelines/group_controller.rb
index b66abe2c..6ef63ef1 100644
--- a/app/controllers/api/v1/timelines/group_controller.rb
+++ b/app/controllers/api/v1/timelines/group_controller.rb
@@ -9,8 +9,6 @@ class Api::V1::Timelines::GroupController < Api::BaseController
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
def show
- mark_as_unread
-
render json: @statuses,
each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
@@ -18,10 +16,6 @@ class Api::V1::Timelines::GroupController < Api::BaseController
private
- def mark_as_unread
- GroupAccount.where(group: @group, account: current_account).update_all("unread_count = 0")
- end
-
def set_group
@group = Group.find(params[:id])
end
diff --git a/app/javascript/gabsocial/features/groups/sidebar_panel/item.js b/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
index a4015c18..22ef3d91 100644
--- a/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
+++ b/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
@@ -30,15 +30,9 @@ class Item extends ImmutablePureComponent {
// Wait for relationships
if (!relationships) return null;
- const unreadCount = relationships.get('unread_count');
-
return (
{group.get('title')}
-
- {unreadCount > 0 && {shortNumberFormat(unreadCount)} {intl.formatMessage(messages.new_statuses)}}
- {unreadCount === 0 && {intl.formatMessage(messages.no_recent_activity)}}
-
);
}
diff --git a/app/models/concerns/group_interactions.rb b/app/models/concerns/group_interactions.rb
index e15e1836..a0833165 100644
--- a/app/models/concerns/group_interactions.rb
+++ b/app/models/concerns/group_interactions.rb
@@ -13,19 +13,12 @@ module GroupInteractions
follow_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id, role: :admin), :group_id)
end
- def unread_count_map(target_group_ids, account_id)
- unread_count_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id), :unread_count)
- end
-
private
def follow_mapping(query, field)
query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
end
- def unread_count_mapping(query, field)
- query.pluck(:group_id, :unread_count).each_with_object({}) { |e, mapping| mapping[e[0]] = e[1] }
- end
end
def accounts_for_local_distribution
diff --git a/app/models/group_account.rb b/app/models/group_account.rb
index b5aa62bc..0f059eee 100644
--- a/app/models/group_account.rb
+++ b/app/models/group_account.rb
@@ -9,10 +9,10 @@
# role :string
# created_at :datetime not null
# updated_at :datetime not null
-# unread_count :integer default(0)
#
class GroupAccount < ApplicationRecord
+ self.ignored_columns = ["unread_count"]
enum role: { admin: "admin" }
belongs_to :group
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index 87b49822..54d9191a 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -6,7 +6,7 @@
# id :bigint(8) not null, primary key
# list_id :bigint(8) not null
# account_id :bigint(8) not null
-# follow_id :bigint(8) not null
+# follow_id :bigint(8) default(1)
#
class ListAccount < ApplicationRecord
diff --git a/app/models/status.rb b/app/models/status.rb
index 85aaf7e4..2524c7a4 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -25,6 +25,7 @@
# group_id :integer
# quote_of_id :bigint(8)
# revised_at :datetime
+# markdown :text
#
class Status < ApplicationRecord
@@ -266,7 +267,6 @@ class Status < ApplicationRecord
after_create_commit :store_uri, if: :local?
after_create_commit :update_statistics, if: :local?
- after_create_commit :increase_group_unread_counts, if: Proc.new { |status| !status.group_id.nil? }
around_create GabSocial::Snowflake::Callbacks
@@ -553,7 +553,4 @@ class Status < ApplicationRecord
end
end
- def increase_group_unread_counts
- GroupAccount.where(group_id: group_id).where.not(account_id: account_id).update_all("unread_count = unread_count + 1")
- end
end
diff --git a/app/presenters/group_relationships_presenter.rb b/app/presenters/group_relationships_presenter.rb
index b6e217d5..55466cf6 100644
--- a/app/presenters/group_relationships_presenter.rb
+++ b/app/presenters/group_relationships_presenter.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class GroupRelationshipsPresenter
- attr_reader :member, :admin, :unread_count
+ attr_reader :member, :admin
def initialize(group_ids, current_account_id, **options)
@group_ids = group_ids.map { |a| a.is_a?(Group) ? a.id : a }
@@ -9,7 +9,6 @@ class GroupRelationshipsPresenter
@member = Group.member_map(@group_ids, @current_account_id)
@admin = Group.admin_map(@group_ids, @current_account_id)
- @unread_count = Group.unread_count_map(@group_ids, @current_account_id)
end
end
\ No newline at end of file
diff --git a/app/serializers/rest/group_relationship_serializer.rb b/app/serializers/rest/group_relationship_serializer.rb
index a420ddbc..ce875681 100644
--- a/app/serializers/rest/group_relationship_serializer.rb
+++ b/app/serializers/rest/group_relationship_serializer.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class REST::GroupRelationshipSerializer < ActiveModel::Serializer
- attributes :id, :member, :admin, :unread_count
+ attributes :id, :member, :admin
def id
object.id.to_s
@@ -15,7 +15,4 @@ class REST::GroupRelationshipSerializer < ActiveModel::Serializer
instance_options[:relationships].admin[object.id] ? true : false
end
- def unread_count
- instance_options[:relationships].unread_count[object.id] || 0
- end
end
diff --git a/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb b/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb
new file mode 100644
index 00000000..bb9c6d59
--- /dev/null
+++ b/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb
@@ -0,0 +1,5 @@
+class RemoveUnreadCountFromGroupAccounts < ActiveRecord::Migration[5.2]
+ def change
+ safety_assured { remove_column :group_accounts, :unread_count, :integer }
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2570abba..ba38cf45 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_03_10_224203) do
+ActiveRecord::Schema.define(version: 2020_05_10_034822) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -327,7 +327,6 @@ ActiveRecord::Schema.define(version: 2020_03_10_224203) do
t.string "role"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
- t.integer "unread_count", default: 0
t.index ["account_id", "group_id"], name: "index_group_accounts_on_account_id_and_group_id", unique: true
t.index ["account_id"], name: "index_group_accounts_on_account_id"
t.index ["group_id", "account_id"], name: "index_group_accounts_on_group_id_and_account_id"
@@ -400,7 +399,7 @@ ActiveRecord::Schema.define(version: 2020_03_10_224203) do
create_table "list_accounts", force: :cascade do |t|
t.bigint "list_id", null: false
t.bigint "account_id", null: false
- t.bigint "follow_id", null: false
+ t.bigint "follow_id", default: 1
t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
@@ -711,6 +710,7 @@ ActiveRecord::Schema.define(version: 2020_03_10_224203) do
t.integer "group_id"
t.bigint "quote_of_id"
t.datetime "revised_at"
+ t.text "markdown"
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
t.index ["group_id"], name: "index_statuses_on_group_id"
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
From 589605c46e08b58a172d27bd08ece48fdf6ecf0f Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Sun, 10 May 2020 00:04:04 -0400
Subject: [PATCH 8/8] Remove refactor migrations from schema
---
app/models/list_account.rb | 2 +-
app/models/status.rb | 1 -
db/schema.rb | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index 54d9191a..87b49822 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -6,7 +6,7 @@
# id :bigint(8) not null, primary key
# list_id :bigint(8) not null
# account_id :bigint(8) not null
-# follow_id :bigint(8) default(1)
+# follow_id :bigint(8) not null
#
class ListAccount < ApplicationRecord
diff --git a/app/models/status.rb b/app/models/status.rb
index 2524c7a4..dd882b86 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -25,7 +25,6 @@
# group_id :integer
# quote_of_id :bigint(8)
# revised_at :datetime
-# markdown :text
#
class Status < ApplicationRecord
diff --git a/db/schema.rb b/db/schema.rb
index ba38cf45..eea79ddc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -399,7 +399,7 @@ ActiveRecord::Schema.define(version: 2020_05_10_034822) do
create_table "list_accounts", force: :cascade do |t|
t.bigint "list_id", null: false
t.bigint "account_id", null: false
- t.bigint "follow_id", default: 1
+ t.bigint "follow_id", null: false
t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
@@ -710,7 +710,6 @@ ActiveRecord::Schema.define(version: 2020_05_10_034822) do
t.integer "group_id"
t.bigint "quote_of_id"
t.datetime "revised_at"
- t.text "markdown"
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
t.index ["group_id"], name: "index_statuses_on_group_id"
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"