diff --git a/daemon.py b/daemon.py index d1a23d2a..f1f26c99 100644 --- a/daemon.py +++ b/daemon.py @@ -1811,12 +1811,21 @@ class PubServer(BaseHTTPRequestHandler): nickname, \ self.server.domain,fields['bio'],[]) actorChanged=True + approveFollowers=False if fields.get('approveFollowers'): - approveFollowers=False - if fields['approveFollowers']!='no': + if fields['approveFollowers']=='on': approveFollowers=True - if approveFollowers!=actorJson['manuallyApprovesFollowers']: - actorJson['manuallyApprovesFollowers']=approveFollowers + if approveFollowers!=actorJson['manuallyApprovesFollowers']: + 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 # save filtered words list filterFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/filters.txt' diff --git a/epicyon-profile.css b/epicyon-profile.css index ec7fe452..077163ed 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -19,7 +19,7 @@ body, html { } .cwText { - display: none; + display: none; } .pageicon { @@ -539,10 +539,11 @@ input[type=submit]:hover { input[type=checkbox] { - -ms-transform: scale(2); - -moz-transform: scale(2); - -webkit-transform: scale(2); - -o-transform: scale(2); - transform: scale(2); - padding: 10px; + -ms-transform: scale(2); + -moz-transform: scale(2); + -webkit-transform: scale(2); + -o-transform: scale(2); + transform: scale(2); + padding: 10px; + margin: 10px 5px; } diff --git a/webinterface.py b/webinterface.py index 8a3841ec..d70f49fc 100644 --- a/webinterface.py +++ b/webinterface.py @@ -45,6 +45,7 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str: if not os.path.isfile(actorFilename): return '' + isBot='' preferredNickname=nickname bioStr='' manuallyApprovesFollowers='' @@ -59,7 +60,10 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str: manuallyApprovesFollowers='checked' else: manuallyApprovesFollowers='' - + if actorJson.get('type'): + if actorJson['type']=='Service': + isBot='checked' + filterStr='' filterFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt' if os.path.isfile(filterFilename): @@ -107,6 +111,7 @@ def htmlEditProfile(baseDir: str,path: str,domain: str,port: int) -> str: ' ' \ '
' \ ' Approve follower requests
' \ + ' This is a bot account
' \ '
Filtered words' \ '
One per line' \ ' ' \