Checkbox for bot accounts

master
Bob Mottram 2019-08-07 21:13:44 +01:00
parent 1245fdcdd1
commit ec25deea0f
3 changed files with 27 additions and 12 deletions

View File

@ -1811,12 +1811,21 @@ class PubServer(BaseHTTPRequestHandler):
nickname, \ nickname, \
self.server.domain,fields['bio'],[]) self.server.domain,fields['bio'],[])
actorChanged=True actorChanged=True
approveFollowers=False
if fields.get('approveFollowers'): if fields.get('approveFollowers'):
approveFollowers=False if fields['approveFollowers']=='on':
if fields['approveFollowers']!='no':
approveFollowers=True approveFollowers=True
if approveFollowers!=actorJson['manuallyApprovesFollowers']: if approveFollowers!=actorJson['manuallyApprovesFollowers']:
actorJson['manuallyApprovesFollowers']=approveFollowers actorJson['manuallyApprovesFollowers']=approveFollowers
actorChanged=True
if fields.get('isBot'):
if fields['isBot']=='on':
if actorJson['type']!='Service':
actorJson['type']='Service'
actorChanged=True
else:
if actorJson['type']!='Person':
actorJson['type']='Person'
actorChanged=True actorChanged=True
# save filtered words list # save filtered words list
filterFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/filters.txt' filterFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/filters.txt'

View File

@ -19,7 +19,7 @@ body, html {
} }
.cwText { .cwText {
display: none; display: none;
} }
.pageicon { .pageicon {
@ -539,10 +539,11 @@ input[type=submit]:hover {
input[type=checkbox] input[type=checkbox]
{ {
-ms-transform: scale(2); -ms-transform: scale(2);
-moz-transform: scale(2); -moz-transform: scale(2);
-webkit-transform: scale(2); -webkit-transform: scale(2);
-o-transform: scale(2); -o-transform: scale(2);
transform: scale(2); transform: scale(2);
padding: 10px; padding: 10px;
margin: 10px 5px;
} }

View File

@ -45,6 +45,7 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str:
if not os.path.isfile(actorFilename): if not os.path.isfile(actorFilename):
return '' return ''
isBot=''
preferredNickname=nickname preferredNickname=nickname
bioStr='' bioStr=''
manuallyApprovesFollowers='' manuallyApprovesFollowers=''
@ -59,7 +60,10 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str:
manuallyApprovesFollowers='checked' manuallyApprovesFollowers='checked'
else: else:
manuallyApprovesFollowers='' manuallyApprovesFollowers=''
if actorJson.get('type'):
if actorJson['type']=='Service':
isBot='checked'
filterStr='' filterStr=''
filterFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt' filterFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt'
if os.path.isfile(filterFilename): if os.path.isfile(filterFilename):
@ -107,6 +111,7 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str:
' </div>' \ ' </div>' \
' <div class="container">' \ ' <div class="container">' \
' <input type="checkbox" class=profilecheckbox" name="approveFollowers" '+manuallyApprovesFollowers+'>Approve follower requests<br>' \ ' <input type="checkbox" class=profilecheckbox" name="approveFollowers" '+manuallyApprovesFollowers+'>Approve follower requests<br>' \
' <input type="checkbox" class=profilecheckbox" name="isBot" '+isBot+'>This is a bot account<br>' \
' <br><b>Filtered words</b>' \ ' <br><b>Filtered words</b>' \
' <br>One per line' \ ' <br>One per line' \
' <textarea id="message" name="filteredWords" placeholder="" style="height:200px">'+filterStr+'</textarea>' \ ' <textarea id="message" name="filteredWords" placeholder="" style="height:200px">'+filterStr+'</textarea>' \