mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 23:02:25 -05:00 
			
		
		
		
	Move a lot of stuff + tidy stuff (#37)
Lots of renaming and moving stuff, some bug fixes, more lenient parsing of notifications and home timeline.
This commit is contained in:
		
					parent
					
						
							
								c4d791be75
							
						
					
				
			
			
				commit
				
					
						3d77f81c7f
					
				
			
		
					 69 changed files with 342 additions and 719 deletions
				
			
		|  | @ -1,164 +0,0 @@ | |||
| /* | ||||
|    GoToSocial | ||||
|    Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org | ||||
| 
 | ||||
|    This program is free software: you can redistribute it and/or modify | ||||
|    it under the terms of the GNU Affero General Public License as published by | ||||
|    the Free Software Foundation, either version 3 of the License, or | ||||
|    (at your option) any later version. | ||||
| 
 | ||||
|    This program is distributed in the hope that it will be useful, | ||||
|    but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|    GNU Affero General Public License for more details. | ||||
| 
 | ||||
|    You should have received a copy of the GNU Affero General Public License | ||||
|    along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| */ | ||||
| 
 | ||||
| package message | ||||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 
 | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||
| ) | ||||
| 
 | ||||
| func (p *processor) notifyStatus(status *gtsmodel.Status) error { | ||||
| 	// if there are no mentions in this status then just bail | ||||
| 	if len(status.Mentions) == 0 { | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	if status.GTSMentions == nil { | ||||
| 		// there are mentions but they're not fully populated on the status yet so do this | ||||
| 		menchies := []*gtsmodel.Mention{} | ||||
| 		for _, m := range status.Mentions { | ||||
| 			gtsm := >smodel.Mention{} | ||||
| 			if err := p.db.GetByID(m, gtsm); err != nil { | ||||
| 				return fmt.Errorf("notifyStatus: error getting mention with id %s from the db: %s", m, err) | ||||
| 			} | ||||
| 			menchies = append(menchies, gtsm) | ||||
| 		} | ||||
| 		status.GTSMentions = menchies | ||||
| 	} | ||||
| 
 | ||||
| 	// now we have mentions as full gtsmodel.Mention structs on the status we can continue | ||||
| 	for _, m := range status.GTSMentions { | ||||
| 		// make sure this is a local account, otherwise we don't need to create a notification for it | ||||
| 		if m.GTSAccount == nil { | ||||
| 			a := >smodel.Account{} | ||||
| 			if err := p.db.GetByID(m.TargetAccountID, a); err != nil { | ||||
| 				// we don't have the account or there's been an error | ||||
| 				return fmt.Errorf("notifyStatus: error getting account with id %s from the db: %s", m.TargetAccountID, err) | ||||
| 			} | ||||
| 			m.GTSAccount = a | ||||
| 		} | ||||
| 		if m.GTSAccount.Domain != "" { | ||||
| 			// not a local account so skip it | ||||
| 			continue | ||||
| 		} | ||||
| 
 | ||||
| 		// make sure a notif doesn't already exist for this mention | ||||
| 		err := p.db.GetWhere([]db.Where{ | ||||
| 			{Key: "notification_type", Value: gtsmodel.NotificationMention}, | ||||
| 			{Key: "target_account_id", Value: m.TargetAccountID}, | ||||
| 			{Key: "origin_account_id", Value: status.AccountID}, | ||||
| 			{Key: "status_id", Value: status.ID}, | ||||
| 		}, >smodel.Notification{}) | ||||
| 		if err == nil { | ||||
| 			// notification exists already so just continue | ||||
| 			continue | ||||
| 		} | ||||
| 		if _, ok := err.(db.ErrNoEntries); !ok { | ||||
| 			// there's a real error in the db | ||||
| 			return fmt.Errorf("notifyStatus: error checking existence of notification for mention with id %s : %s", m.ID, err) | ||||
| 		} | ||||
| 
 | ||||
| 		// if we've reached this point we know the mention is for a local account, and the notification doesn't exist, so create it | ||||
| 		notif := >smodel.Notification{ | ||||
| 			NotificationType: gtsmodel.NotificationMention, | ||||
| 			TargetAccountID:  m.TargetAccountID, | ||||
| 			OriginAccountID:  status.AccountID, | ||||
| 			StatusID:         status.ID, | ||||
| 		} | ||||
| 
 | ||||
| 		if err := p.db.Put(notif); err != nil { | ||||
| 			return fmt.Errorf("notifyStatus: error putting notification in database: %s", err) | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func (p *processor) notifyFollowRequest(followRequest *gtsmodel.FollowRequest, receivingAccount *gtsmodel.Account) error { | ||||
| 	// return if this isn't a local account | ||||
| 	if receivingAccount.Domain != "" { | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	notif := >smodel.Notification{ | ||||
| 		NotificationType: gtsmodel.NotificationFollowRequest, | ||||
| 		TargetAccountID:  followRequest.TargetAccountID, | ||||
| 		OriginAccountID:  followRequest.AccountID, | ||||
| 	} | ||||
| 
 | ||||
| 	if err := p.db.Put(notif); err != nil { | ||||
| 		return fmt.Errorf("notifyFollowRequest: error putting notification in database: %s", err) | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func (p *processor) notifyFollow(follow *gtsmodel.Follow, receivingAccount *gtsmodel.Account) error { | ||||
| 	// return if this isn't a local account | ||||
| 	if receivingAccount.Domain != "" { | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	// first remove the follow request notification | ||||
| 	if err := p.db.DeleteWhere([]db.Where{ | ||||
| 		{Key: "notification_type", Value: gtsmodel.NotificationFollowRequest}, | ||||
| 		{Key: "target_account_id", Value: follow.TargetAccountID}, | ||||
| 		{Key: "origin_account_id", Value: follow.AccountID}, | ||||
| 	}, >smodel.Notification{}); err != nil { | ||||
| 		return fmt.Errorf("notifyFollow: error removing old follow request notification from database: %s", err) | ||||
| 	} | ||||
| 
 | ||||
| 	// now create the new follow notification | ||||
| 	notif := >smodel.Notification{ | ||||
| 		NotificationType: gtsmodel.NotificationFollow, | ||||
| 		TargetAccountID:  follow.TargetAccountID, | ||||
| 		OriginAccountID:  follow.AccountID, | ||||
| 	} | ||||
| 	if err := p.db.Put(notif); err != nil { | ||||
| 		return fmt.Errorf("notifyFollow: error putting notification in database: %s", err) | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func (p *processor) notifyFave(fave *gtsmodel.StatusFave, receivingAccount *gtsmodel.Account) error { | ||||
| 	// return if this isn't a local account | ||||
| 	if receivingAccount.Domain != "" { | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	notif := >smodel.Notification{ | ||||
| 		NotificationType: gtsmodel.NotificationFave, | ||||
| 		TargetAccountID:  fave.TargetAccountID, | ||||
| 		OriginAccountID:  fave.AccountID, | ||||
| 		StatusID:         fave.StatusID, | ||||
| 	} | ||||
| 
 | ||||
| 	if err := p.db.Put(notif); err != nil { | ||||
| 		return fmt.Errorf("notifyFave: error putting notification in database: %s", err) | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func (p *processor) notifyAnnounce(status *gtsmodel.Status) error { | ||||
| 	return nil | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue