Bump docker/build-push-action from 3.2.0 to 3.3.0

.github/workflows/docker-publish.yml

@@ -53,7 +53,7 @@ jobs:
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker images
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v3.3.0
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

app.go

@@ -784,6 +784,51 @@ func DoDeleteAccount(apper Apper, username string) error {
 	return nil
 }
 
+func DoSilenceAccount(apper Apper, username string) error {
+	// Connect to the database
+	apper.LoadConfig()
+	connectToDatabase(apper.App())
+	defer shutdown(apper.App())
+
+	// check user exists
+	u, err := apper.App().db.GetUserForAuth(username)
+	if err != nil {
+		log.Error("%s", err)
+		os.Exit(1)
+	}
+	userID := u.ID
+
+	// do not silence the admin account
+	// TODO: check for other admins and skip?
+	if u.IsAdmin() {
+		log.Error("Can not silence admin account")
+		os.Exit(1)
+	}
+
+	// confirm deletion, w/ w/out posts
+	prompt := promptui.Prompt{
+		Templates: &promptui.PromptTemplates{
+			Success: "{{ . | bold | faint }}: ",
+		},
+		Label:     fmt.Sprintf("Really silence user : %s", username),
+		IsConfirm: true,
+	}
+	_, err = prompt.Run()
+	if err != nil {
+		log.Info("Aborted...")
+		os.Exit(0)
+	}
+
+	log.Info("Silencing...")
+	err = apper.App().db.SilenceAccount(userID)
+	if err != nil {
+		log.Error("%s", err)
+		os.Exit(1)
+	}
+	log.Info("Success.")
+	return nil
+}
+
 func connectToDatabase(app *App) {
 	log.Info("Connecting to %s database...", app.cfg.Database.Type)
 

cmd/writefreely/main.go

@@ -84,6 +84,11 @@ func main() {
 				Usage:  "Delete a user with the given username",
 				Hidden: true,
 			},
+			&cli.StringFlag{
+				Name:   "silence-user",
+				Usage:  "Silence a user with the given username",
+				Hidden: true,
+			},
 			&cli.StringFlag{
 				Name:   "reset-pass",
 				Usage:  "Reset the given user's password",
@@ -151,6 +156,8 @@ func legacyActions(c *cli.Context) error {
 		return writefreely.CreateUser(app, username, password, false)
 	case c.IsSet("delete-user"):
 		return writefreely.DoDeleteAccount(app, c.String("delete-user"))
+	case c.IsSet("silence-user"):
+		return writefreely.DoSilenceAccount(app, c.String("silence-user"))
 	case c.IsSet("reset-pass"):
 		return writefreely.ResetPassword(app, c.String("reset-pass"))
 	}

cmd/writefreely/user.go

@@ -24,6 +24,7 @@ var (
 		Subcommands: []*cli.Command{
 			&cmdAddUser,
 			&cmdDelUser,
+			&cmdSilenceUser,
 			&cmdResetPass,
 			// TODO: possibly add a user list command
 		},
@@ -50,6 +51,13 @@ var (
 		Action:  delUserAction,
 	}
 
+	cmdSilenceUser cli.Command = cli.Command{
+		Name:    "silence",
+		Usage:   "Silence user",
+		Aliases: []string{"sil", "s"},
+		Action:  silenceUserAction,
+	}
+
 	cmdResetPass cli.Command = cli.Command{
 		Name:    "reset-pass",
 		Usage:   "Reset user's password",
@@ -84,6 +92,17 @@ func delUserAction(c *cli.Context) error {
 	return writefreely.DoDeleteAccount(app, username)
 }
 
+func silenceUserAction(c *cli.Context) error {
+	username := ""
+	if c.NArg() > 0 {
+		username = c.Args().Get(0)
+	} else {
+		return fmt.Errorf("No user passed. Example: writefreely user silence [USER]")
+	}
+	app := writefreely.NewApp(c.String("c"))
+	return writefreely.DoSilenceAccount(app, username)
+}
+
 func resetPassAction(c *cli.Context) error {
 	username := ""
 	if c.NArg() > 0 {

database.go

@@ -68,6 +68,7 @@ type writestore interface {
 	GetTemporaryAccessToken(userID int64, validSecs int) (string, error)
 	GetTemporaryOneTimeAccessToken(userID int64, validSecs int, oneTime bool) (string, error)
 	DeleteAccount(userID int64) error
+	SilenceAccount(userID int64) error
 	ChangeSettings(app *App, u *User, s *userSettings) error
 	ChangePassphrase(userID int64, sudo bool, curPass string, hashedPass []byte) error
 
@@ -2404,6 +2405,33 @@ func (db *datastore) DeleteAccount(userID int64) error {
 	return nil
 }
 
+func (db *datastore) SilenceAccount(userID int64) error {
+	// Start transaction
+	t, err := db.Begin()
+	if err != nil {
+		log.Error("Unable to begin: %v", err)
+		return err
+	}
+
+	// Update user state
+	_, err = t.Exec("UPDATE users SET status=1 WHERE id=?", userID)
+        if err != nil {
+		t.Rollback()
+		return fmt.Errorf("Unable to update user status: %s", err)
+	}
+
+	// Commit all changes to the database
+	err = t.Commit()
+	if err != nil {
+		t.Rollback()
+		log.Error("Unable to commit: %v", err)
+		return err
+	}
+
+	// TODO: federate delete actor here too?
+	return nil
+}
+
 func (db *datastore) GetAPActorKeys(collectionID int64) ([]byte, []byte) {
 	var pub, priv []byte
 	err := db.QueryRow("SELECT public_key, private_key FROM collectionkeys WHERE collection_id = ?", collectionID).Scan(&pub, &priv)

pages/landing.tmpl

@@ -107,10 +107,15 @@ form dd {
 			</form>
 		</div>
 		{{end}}
+		{{ else }}
+                  {{ if .UserInvites }}
+                    <p style="font-size: 1.3em; margin: 1rem 0;">Registration is by invitation.</p>
+		    <p>Contact us, or an existing user, to get an invite link.</p>
 		{{ else }}
 		<p style="font-size: 1.3em; margin: 1rem 0;">Registration is currently closed.</p>
 		<p>You can always sign up on <a href="https://writefreely.org/instances">another instance</a>.</p>
 		{{ end }}
+		{{ end }}
 	</div>
 </div>
 

templates/include/footer.tmpl

@@ -26,6 +26,7 @@
 							<li><a href="/about">about</a></li>
 							{{if and (and (not .SingleUser) .LocalTimeline) .CanViewReader}}<a href="/read">reader</a>{{end}}
 							<li><a href="/privacy">privacy</a></li>
+							<li><a rel="me" href="https://mastodon.nl/@mrb">Admin contact</a></li>
 						</ul>
 					</div>
 					<div class="half">

templates/include/post-render.tmpl

@@ -34,9 +34,7 @@
 
     // Given a set of nodes, run highlighting on them
     function highlight(nodes) {
-      for (i=0; i < nodes.length; i++) {
-          hljs.highlightBlock(nodes[i]);
-      }
+        nodes.forEach(node => { hljs.highlightBlock(node); });
     }
 
     // Given a array of URIs, load them in order
@@ -45,11 +43,11 @@
         var sc = document.createElement('script');
         sc.src = uri;
         sc.async = false; // critical?
-	  // Set callback on last script
+        // Set callback on last script
         if (uris.indexOf(uri) == uris.length-1) {
-	  // Set callback regardless
-	  // so we're sure it will run if last element had error
-	  // (we only know after loading, so we've had load time already)
+          // Set callback regardless
+          // so we're sure it will run if last element had error
+          // (we only know after loading, so we've had load time already)
           sc.onload  = callback; sc.onerror = callback;
         }
         document.head.appendChild(sc);
@@ -58,19 +56,21 @@
 
     // We don't have to do anything if there are no language blocks
     if (lb.length > 0) {
-      // We have blocks to be highlighted, so we load css
-      var st = document.createElement('link');
-      st.rel = "stylesheet";
-      st.href = "/css/lib/atom-one-light.min.css";
-      document.head.appendChild(st);
+        // We have blocks to be highlighted, so we load css
+        var st = document.createElement('link');
+        st.rel = "stylesheet";
+        st.href = "/css/lib/atom-one-light.min.css";
+        document.head.appendChild(st);
 
       // Construct set of files to load, in order
       var jss = [hlbaseUri + "highlight.min.js"];
       // Check what we need to load
       for (i=0; i < lb.length; i++) {
         lang = lb[i].className.replace('language-','').toLowerCase();
         // Support the aliases specified above
+        // and make sure the block has the non-aliased name
         if (aliasmap[lang]) lang = aliasmap[lang];
+        lb[i].className = 'language-' + lang;
         lurl = hlbaseUri + "highlightjs/" + lang + ".min.js";
         if (!jss.includes(lurl)) {
           jss.push(lurl);
@@ -79,9 +79,9 @@
       // Load files in order, higlight on last load
       loadLanguages(jss, () => {highlight(lb)});
     }
-  });
+});
 </script>
-{{end}}
+    {{end}}
 
 <!-- Include mathjax configuration -->
 {{define "mathjax"}}