moar work

internal/db/db.go

@@ -174,6 +174,10 @@ type DB interface {
 	// The passed mediaAttachment pointer will be populated with the value of the header, if it exists.
 	GetHeaderForAccountID(header *model.MediaAttachment, accountID string) error
 
+	// Blocked checks whether a block exists in eiher direction between two accounts.
+	// That is, it returns true if account1 blocks account2, OR if account2 blocks account1.
+	Blocked(account1 string, account2 string) (bool, error)
+
 	/*
 		USEFUL CONVERSION FUNCTIONS
 	*/

internal/db/model/block.go

@@ -0,0 +1,19 @@
+package model
+
+import "time"
+
+// Block refers to the blocking of one account by another.
+type Block struct {
+	// id of this block in the database
+	ID string `pg:"type:uuid,default:gen_random_uuid(),pk,notnull"`
+	// When was this block created
+	CreatedAt time.Time `pg:"type:timestamp,notnull,default:now()"`
+	// When was this block updated
+	UpdatedAt time.Time `pg:"type:timestamp,notnull,default:now()"`
+	// Who created this block?
+	AccountID string `pg:",notnull"`
+	// Who is targeted by this block?
+	TargetAccountID string `pg:",notnull"`
+	// Activitypub URI for this block
+	URI string
+}

internal/db/pg.go

@@ -511,6 +511,22 @@ func (ps *postgresService) GetAvatarForAccountID(avatar *model.MediaAttachment,
 	return nil
 }
 
+func (ps *postgresService) Blocked(account1 string, account2 string) (bool, error) {
+	var blocked bool
+	if err := ps.conn.Model(&model.Block{}).
+		Where("account_id = ?", account1).Where("target_account_id = ?", account2).
+		WhereOr("target_account_id = ?", account1).Where("account_id = ?", account2).
+		Select(); err != nil {
+		if err == pg.ErrNoRows {
+			blocked = false
+		} else {
+			return blocked, err
+		}
+	}
+	blocked = true
+	return blocked, nil
+}
+
 /*
 	CONVERSION FUNCTIONS
 */
@@ -712,7 +728,7 @@ func (ps *postgresService) MentionStringsToMentions(targetAccounts []string, ori
 
 		// id, createdAt and updatedAt will be populated by the db, so we have everything we need!
 		menchies = append(menchies, &model.Mention{
-			StatusID: statusID,
+			StatusID:        statusID,
 			OriginAccountID: originAccountID,
 			TargetAccountID: mentionedAccount.ID,
 		})
@@ -745,7 +761,7 @@ func (ps *postgresService) EmojiStringsToEmojis(emojis []string, originAccountID
 				continue
 			}
 			// a serious error has happened so bail
-			return nil, fmt.Errorf("error getting emoji with shortcode %s: %s",e, err)
+			return nil, fmt.Errorf("error getting emoji with shortcode %s: %s", e, err)
 		}
 		newEmojis = append(newEmojis, emoji)
 	}