Add remove tribe on townsquare (#7152)

* Add remove tribe on townsquare

* fix migration

* Add missing filters

* Replace object for ManyToMany

* remove miration file

* add migration file

Author: zoek1

app/app/urls.py

@@ -145,6 +145,11 @@
         dashboard.views.get_suggested_contributors,
         name='get_suggested_contributors'
     ),
+    url(
+        r'^api/v0.1/ignore_suggested_tribes/(?P<tribeId>.*)',
+        townsquare.views.ignored_suggested_tribe,
+        name='ignore_suggested_tribes'
+    ),
     url(
         r'^api/v0.1/social_contribution_email',
         dashboard.views.social_contribution_email,

app/assets/v2/js/pages/join_tribe.js

@@ -106,6 +106,65 @@ const tribeLeader = () => {
 
 tribeLeader();
 
+const build_suggested_tribe = (tribe) => {
+  return `
+    <li class="nav-item d-flex justify-content-between align-items-center my-1">
+      <a style="max-width: 70%;" href="/profile/${ tribe.title }" class="d-flex nav-link nav-line pr-0 mr-0">
+        <img src="${tribe.avatar_url}" class="rounded-circle avatar mr-2" />
+        <span class="font-caption">
+          <span class="nav-title pt-0 mb-0">${tribe.title}</span>
+          <span class="font-smaller-7">(${ tribe.follower_count } followers)</span>
+        </span>
+      </a>
+      <div>
+        <a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-7 px-3" href="#" data-jointribe="${ tribe.title }">
+          Follow
+        </a>
+        <button data-ignore-tribe="${ tribe.title }"  class="font-smaller-6 px-0 remove-tribe btn btn-link"><i class="fa fa-times"></i></button>
+      </div>
+    </li>`;
+};
+
+$(document).on('click', '.remove-tribe', function(e) {
+  const element = e.target;
+
+  if (!document.contxt.github_handle) {
+    e.preventDefault();
+    _alert('Please login first.', 'error');
+    return;
+  }
+  $(element).attr('disabled', true);
+
+  e.preventDefault();
+  let tribe;
+
+  if ($(element).data('ignore-tribe')) {
+    tribe = $(element).data('ignore-tribe');
+  } else {
+    tribe = $(element.parentElement).data('ignore-tribe');
+  }
+
+
+  const new_suggested_tribes = fetchData(`api/v0.1/ignore_suggested_tribes/${tribe}`, 'PUT');
+
+  $.when(new_suggested_tribes).then((response) => {
+    $('#suggested-tribes ul').fadeOut(300, function() {
+      $(this).empty();
+
+      response.tribes.map((tribe) => {
+        const new_suggested_tribe = build_suggested_tribe(tribe);
+
+        $('#suggested-tribes ul').append(new_suggested_tribe);
+      });
+
+    });
+
+
+  });
+
+});
+
+
 const newManageTribe = () => {
   $('[data-tribe]').each(function(index, elem) {
     $(elem).on('mouseenter focus', function(e) {

app/dashboard/migrations/0135_auto_20200730_1518.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.4 on 2020-07-30 15:18
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0134_auto_20200728_1114'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='ignore_tribes',
+            field=models.ManyToManyField(related_name='ignore', to='dashboard.Profile'),
+        ),
+        migrations.AlterField(
+            model_name='tribessubscription',
+            name='expires_on',
+            field=models.DateTimeField(blank=True, default=datetime.datetime(2021, 7, 30, 15, 18, 54, 734516), null=True),
+        ),
+    ]

app/dashboard/models.py

@@ -2789,7 +2789,7 @@ class Profile(SuperModel):
     last_validation_request = models.DateTimeField(blank=True, null=True, help_text=_("When the user requested a code for last time "))
     encoded_number = models.CharField(max_length=255, blank=True, help_text=_('Number with the user validate the account'))
     sybil_score = models.IntegerField(default=-1)
-
+    ignore_tribes = models.ManyToManyField('dashboard.Profile', related_name='ignore')
     objects = ProfileManager()
     objects_full = ProfileQuerySet.as_manager()
 

app/townsquare/templates/townsquare/shared/feednav.html

@@ -80,23 +80,26 @@
       Suggested Tribes
     </div>
     <div id="suggested-tribes" class="panel-active">
-      <ul class="nav d-inline-block font-body col-sm-9 col-lg-8 pr-2" style="padding-right: 0">
+      <ul class="nav d-inline-block font-body col-sm-9 col-lg-9 pr-2" style="padding-right: 0">
         {% for tribe in suggested_tribes %}
           <li class="nav-item d-flex justify-content-between align-items-center my-1">
-            <a href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
+            <a style="max-width: 70%;" href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
               <img src="{{tribe.avatar_url}}" class="rounded-circle avatar mr-2" />
               <span class="font-caption">
                 <span class="nav-title pt-0 mb-0">{{tribe.title}}</span>
                 <span class="font-smaller-7">({{ tribe.follower_count }} followers)</span>
               </span>
             </a>
-            <a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-7 px-3" href="#" data-jointribe="{{ tribe.title }}">
-              Follow
-            </a>
+            <div>
+              <a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-7 px-3" href="#" data-jointribe="{{ tribe.title }}">
+                Follow
+              </a>
+              <button data-ignore-tribe="{{ tribe.title }}" class="font-smaller-6 px-0 remove-tribe btn btn-link"><i class="fa fa-times"></i></button>
+            </div>
           </li>
         {% endfor %}
       </ul>
     </div>
   </div>
   <hr>
-</div>
+</div>

app/townsquare/views.py

@@ -1,14 +1,19 @@
 import re
 import time
+from random import random, shuffle
 
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.auth.decorators import login_required
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.response import TemplateResponse
 from django.utils import timezone
 
 import metadata_parser
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_http_methods
+
 from app.services import RedisService
 from dashboard.helpers import load_files_in_directory
 from dashboard.models import (
@@ -299,11 +304,33 @@ def get_param_metadata(request, tab):
     return title, desc, page_seo_text_insert, avatar_url, is_direct_link, admin_link
 
 
+@login_required
+@require_http_methods(['PUT'])
+@csrf_exempt
+def ignored_suggested_tribe(request, tribeId):
+    profile = request.user.profile
+    tribe_profile = get_object_or_404(Profile, handle__iexact=tribeId)
+
+    profile.ignore_tribes.add(tribe_profile)
+
+    return JsonResponse({
+       'tribes': get_suggested_tribes(request)
+    })
+
+
 def get_suggested_tribes(request):
     following_tribes = []
     if request.user.is_authenticated:
-        handles = TribeMember.objects.filter(profile=request.user.profile).distinct('org').values_list('org__handle', flat=True)
-        tribes = Profile.objects.filter(is_org=True).exclude(handle__in=list(handles)).order_by('-follower_count')[:5]
+        profile = request.user.profile
+        ignore = list(profile.ignore_tribes.all().values_list('pk', flat=True))
+        handles = TribeMember.objects.filter(profile=profile).distinct('org').values_list('org__handle', flat=True)
+        tribes = Profile.objects.filter(is_org=True).exclude(handle__in=list(handles)).exclude(pk__in=ignore).order_by('-follower_count')
+        count = tribes.count()
+
+        if count > 5:
+            index_shuffle = list(range(count if count < 60 else 60))
+            shuffle(index_shuffle)
+            tribes = [tribes[index] for index in index_shuffle[:5]]
 
         for profile in tribes:
             handle = profile.handle