Add option to skip pinned messages (#43)

client/api.go

@@ -5,10 +5,11 @@ import (
 	"discord-delete/client/spoof"
 	"encoding/json"
 	"fmt"
-	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
 	"net/http"
 	"time"
+
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 const api = "https://discord.com/api/v8"
@@ -42,6 +43,7 @@ type Client struct {
 	maxID        int64
 	minID        int64
 	skipChannels []string
+	skipPinned   bool
 	httpClient   http.Client
 }
 
@@ -204,6 +206,12 @@ func (c *Client) DeleteMessages(messages *Messages, seek *int) error {
 				continue
 			}
 
+			if c.skipPinned && msg.Pinned {
+				log.Infof("Found pinned message, skipping")
+				(*seek)++
+				continue
+			}
+
 			log.Infof("Deleting message %v from channel %v", msg.ID, msg.ChannelID)
 			if c.dryRun {
 				// Move seek index forward to simulate message deletion on server's side
@@ -360,6 +368,7 @@ type Message struct {
 	Hit       bool   `json:"hit,omitempty"`
 	ChannelID string `json:"channel_id"`
 	Type      int    `json:"type"`
+	Pinned    bool   `json:"pinned"`
 }
 
 type Messages struct {

client/args.go

@@ -2,8 +2,9 @@ package client
 
 import (
 	"errors"
-	log "github.com/sirupsen/logrus"
 	"time"
+
+	log "github.com/sirupsen/logrus"
 )
 
 var (
@@ -20,6 +21,10 @@ func (c *Client) SetSkipChannels(skipChannels []string) {
 	c.skipChannels = skipChannels
 }
 
+func (c *Client) SetSkipPinned(skipPinned bool) {
+	c.skipPinned = skipPinned
+}
+
 func (c *Client) SetMinAge(minAge uint) error {
 	t := time.Now().Add(-time.Duration(minAge) * day)
 	millis := t.UnixNano() / int64(time.Millisecond)

cmd/partial.go

@@ -3,13 +3,15 @@ package cmd
 import (
 	"discord-delete/client"
 	"discord-delete/client/token"
+	"os"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 var (
 	dryrun       bool
+	skipPinned   bool
 	minAge       uint
 	maxAge       uint
 	skipChannels []string
@@ -43,7 +45,8 @@ func partial(cmd *cobra.Command, args []string) {
 	client := client.New(tok)
 	client.SetDryRun(dryrun)
 	client.SetSkipChannels(skipChannels)
-
+	client.SetSkipPinned(skipPinned)
+
 	if dryrun {
 		log.Infof("No messages will be deleted in dry-run mode")
 	}
@@ -75,4 +78,5 @@ func init() {
 	partialCmd.Flags().UintVarP(&minAge, "older-than-days", "o", 0, "minimum number in days of messages to be deleted")
 	partialCmd.Flags().UintVarP(&maxAge, "newer-than-days", "n", 0, "maximum number in days of messages to be deleted")
 	partialCmd.Flags().StringSliceVarP(&skipChannels, "skip", "s", []string{}, "skip message deletion for specified channels/guilds")
+	partialCmd.Flags().BoolVarP(&skipPinned, "skip-pinned", "p", false, "skip message deletion for pinned messages")
 }