From 2b6aa8e86f00d3e36b888fa618fd4d5d01be0f0e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 29 Jul 2019 19:48:23 +0100
Subject: [PATCH] follow approvals

---
 epicyon-profile.css |  46 +++++++++++++++++++++++++++++++++++++++++---
 img/icons/new.png   | Bin 0 -> 3982 bytes
 webinterface.py     |  37 ++++++++++++++++++++++++++++++++++-
 3 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 img/icons/new.png

diff --git a/epicyon-profile.css b/epicyon-profile.css
index 555717bb..16bb3c3c 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -33,6 +33,10 @@ body, html {
     color: white;
 }
 
+.highlight {
+    width: 2%;
+}
+
 .roles {
     text-align: center;
     left: 35%;
@@ -73,7 +77,7 @@ body, html {
     text-align: center;
     font-size: 18px;
     padding: 10px;
-    width: 20%;
+    width: 25%;
     max-width: 200px;
     min-width: 100px;
     transition: all 0.5s;
@@ -81,6 +85,42 @@ body, html {
     margin: 5px;
 }
 
+.followApprove {
+    border-radius: 4px;
+    background-color: darkgreen;
+    border: none;
+    color: #FFFFFF;
+    text-align: center;
+    font-size: 18px;
+    padding: 10px;
+    width: 15%;
+    max-width: 150px;
+    min-width: 100px;
+    cursor: pointer;
+    margin: 0 15px;
+    float: right;
+}
+
+.followDeny {
+    border-radius: 4px;
+    background-color: darkred;
+    border: none;
+    color: #FFFFFF;
+    text-align: center;
+    font-size: 18px;
+    padding: 10px;
+    width: 15%;
+    max-width: 150px;
+    min-width: 100px;
+    cursor: pointer;
+    margin: 0 15px;
+    float: right;
+}
+
+.followRequestHandle {
+    padding: 0px 20px;
+}
+
 .button span {
     cursor: pointer;
     display: inline-block;
@@ -116,7 +156,7 @@ body, html {
     padding: 10px;
     width: 20%;
     max-width: 200px;
-    min-width: 100px;
+    min-width: 140px;
     transition: all 0.5s;
     cursor: pointer;
     margin: 5px;
@@ -169,7 +209,7 @@ body, html {
 .container img {
     float: left;
     max-width: 60px;
-    width: 100%;
+    width: 10%;
     margin-right: 20px;
     border-radius: 10%;
 }
diff --git a/img/icons/new.png b/img/icons/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ffba4282025df16af3c2afea3bd8b189049fb48
GIT binary patch
literal 3982
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

literal 0
HcmV?d00001

diff --git a/webinterface.py b/webinterface.py
index ff1d363c..3f5a6508 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -296,8 +296,41 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \
     elif selected=='shares':
         sharesButton='buttonselected'
     loginButton=''
+
+    followApprovalsSection=''
+    followApprovals=''
+
     if not authorized:
         loginButton='<br><a href="/login"><button class="loginButton">Login</button></a>'
+    else:
+        # are there any follow requests?
+        followRequestsFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/followrequests.txt'
+        if os.path.isfile(followRequestsFilename):
+            with open(followRequestsFilename,'r') as f:
+                for line in f:
+                    if len(line)>0:
+                        # show a star on the followers tab
+                        followApprovals='<img class="highlight" src="/icons/new.png"/>'
+                        break
+        if selected=='followers':
+            if len(followApprovals)>0:
+                with open(followRequestsFilename,'r') as f:
+                    for followerHandle in f:
+                        if len(line)>0:
+                            if '://' in followerHandle:
+                                followerActor=followerHandle
+                            else:
+                                followerActor=httpPrefix+'://'+followerHandle.split('@')[1]+'/users/'+followerHandle.split('@')[0]
+                            basePath=httpPrefix+'://'+domainFull+'/users/'+nickname
+                            followApprovalsSection+='<div class="container">'
+                            followApprovalsSection+='<a href="'+followerActor+'">'
+                            followApprovalsSection+='<span class="followRequestHandle">'+followerHandle+'</span></a>'
+                            followApprovalsSection+='<a href="'+basePath+'/followapprove='+followerHandle+'">'
+                            followApprovalsSection+='<button class="followApprove">Approve</button></a>'
+                            followApprovalsSection+='<a href="'+basePath+'/followdeny='+followerHandle+'">'
+                            followApprovalsSection+='<button class="followDeny">Deny</button></a>'
+                            followApprovalsSection+='</div>'
+
     actor=profileJson['id']
     profileStr= \
         ' <div class="hero-image">' \
@@ -313,13 +346,15 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \
         '  <center>' \
         '    <a href="'+actor+'"><button class="'+postsButton+'"><span>Posts </span></button></a>' \
         '    <a href="'+actor+'/following"><button class="'+followingButton+'"><span>Following </span></button></a>' \
-        '    <a href="'+actor+'/followers"><button class="'+followersButton+'"><span>Followers </span></button></a>' \
+        '    <a href="'+actor+'/followers"><button class="'+followersButton+'"><span>Followers </span>'+followApprovals+'</button></a>' \
         '    <a href="'+actor+'/roles"><button class="'+rolesButton+'"><span>Roles </span></button></a>' \
         '    <a href="'+actor+'/skills"><button class="'+skillsButton+'"><span>Skills </span></button></a>' \
         '    <a href="'+actor+'/shares"><button class="'+sharesButton+'"><span>Shares </span></button></a>' \
         '  </center>' \
         '</div>'
 
+    profileStr+=followApprovalsSection
+    
     with open(baseDir+'/epicyon-profile.css', 'r') as cssFile:
         profileStyle = cssFile.read().replace('image.png',actor+'/image.png')