back round 1 view raw

appview: allow timeline db queries to be filterable by users follows #626

closed

opened by

willdot.net 2 months ago targeting master from willdot.net/tangled-core: feat/filter-user-timeline

Signed-off-by: Will Andrews did:plc:dadhhalkfcq3gucaq25hjqon

options

unified split

Changed files

+57 -12

appview

timeline.go

pages

pages.go

templates

timeline

fragments

timeline.html

+38 -10

appview/db/timeline.go

···

       9
       9
        
       

     

       10
       10
        
       // TODO: this gathers heterogenous events from different sources and aggregates

     

       11
       11
        
       // them in code; if we did this entirely in sql, we could order and limit and paginate easily

     

       12
       12
       -
       func MakeTimeline(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       12
       12
       +
       func MakeTimeline(e Execer, limit int, loggedInUserDid string, limitToUsersIsFollowing bool) ([]models.TimelineEvent, error) {

     

       13
       13
        
       	var events []models.TimelineEvent

     

       14
       14
        
       

     

       15
       15
       -
       	repos, err := getTimelineRepos(e, limit, loggedInUserDid)

     

       15
       15
       +
       	var userIsFollowing []string

     

       16
       16
       +
       	if limitToUsersIsFollowing {

     

       17
       17
       +
       		following, err := GetFollowing(e, loggedInUserDid)

     

       18
       18
       +
       		if err != nil {

     

       19
       19
       +
       			return nil, err

     

       20
       20
       +
       		}

     

       21
       21
       +
       

     

       22
       22
       +
       		userIsFollowing = make([]string, 0, len(following))

     

       23
       23
       +
       		for _, follow := range following {

     

       24
       24
       +
       			userIsFollowing = append(userIsFollowing, follow.SubjectDid)

     

       25
       25
       +
       		}

     

       26
       26
       +
       	}

     

       27
       27
       +
       

     

       28
       28
       +
       	repos, err := getTimelineRepos(e, limit, loggedInUserDid, userIsFollowing)

     

       16
       29
        
       	if err != nil {

     

       17
       30
        
       		return nil, err

     

       18
       31
        
       	}

     

       19
       32
        
       

     

       20
       20
       -
       	stars, err := getTimelineStars(e, limit, loggedInUserDid)

     

       33
       33
       +
       	stars, err := getTimelineStars(e, limit, loggedInUserDid, userIsFollowing)

     

       21
       34
        
       	if err != nil {

     

       22
       35
        
       		return nil, err

     

       23
       36
        
       	}

     

       24
       37
        
       

     

       25
       25
       -
       	follows, err := getTimelineFollows(e, limit, loggedInUserDid)

     

       38
       38
       +
       	follows, err := getTimelineFollows(e, limit, loggedInUserDid, userIsFollowing)

     

       26
       39
        
       	if err != nil {

     

       27
       40
        
       		return nil, err

     

       28
       41
        
       	}

     
···

       70
       83
        
       	return isStarred, starCount

     

       71
       84
        
       }

     

       72
       85
        
       

     

       73
       73
       -
       func getTimelineRepos(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       74
       74
       -
       	repos, err := GetRepos(e, limit)

     

       86
       86
       +
       func getTimelineRepos(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) {

     

       87
       87
       +
       	filters := make([]filter, 0)

     

       88
       88
       +
       	if userIsFollowing != nil {

     

       89
       89
       +
       		filters = append(filters, FilterIn("did", userIsFollowing))

     

       90
       90
       +
       	}

     

       91
       91
       +
       

     

       92
       92
       +
       	repos, err := GetRepos(e, limit, filters...)

     

       75
       93
        
       	if err != nil {

     

       76
       94
        
       		return nil, err

     

       77
       95
        
       	}

     
···

       125
       143
        
       	return events, nil

     

       126
       144
        
       }

     

       127
       145
        
       

     

       128
       128
       -
       func getTimelineStars(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       129
       129
       -
       	stars, err := GetStars(e, limit)

     

       146
       146
       +
       func getTimelineStars(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) {

     

       147
       147
       +
       	filters := make([]filter, 0)

     

       148
       148
       +
       	if userIsFollowing != nil {

     

       149
       149
       +
       		filters = append(filters, FilterIn("starred_by_did", userIsFollowing))

     

       150
       150
       +
       	}

     

       151
       151
       +
       

     

       152
       152
       +
       	stars, err := GetStars(e, limit, filters...)

     

       130
       153
        
       	if err != nil {

     

       131
       154
        
       		return nil, err

     

       132
       155
        
       	}

     
···

       166
       189
        
       	return events, nil

     

       167
       190
        
       }

     

       168
       191
        
       

     

       169
       169
       -
       func getTimelineFollows(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       170
       170
       -
       	follows, err := GetFollows(e, limit)

     

       192
       192
       +
       func getTimelineFollows(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) {

     

       193
       193
       +
       	filters := make([]filter, 0)

     

       194
       194
       +
       	if userIsFollowing != nil {

     

       195
       195
       +
       		filters = append(filters, FilterIn("user_did", userIsFollowing))

     

       196
       196
       +
       	}

     

       197
       197
       +
       

     

       198
       198
       +
       	follows, err := GetFollows(e, limit, filters...)

     

       171
       199
        
       	if err != nil {

     

       172
       200
        
       		return nil, err

     

       173
       201
        
       	}

appview/pages/pages.go

···

       306
       306
        
       	LoggedInUser *oauth.User

     

       307
       307
        
       	Timeline     []models.TimelineEvent

     

       308
       308
        
       	Repos        []models.Repo

     

       309
       309
       +
       	Filtered     bool

     

       309
       310
        
       }

     

       310
       311
        
       

     

       311
       312
        
       func (p *Pages) Timeline(w io.Writer, params TimelineParams) error {

+18 -2

appview/pages/templates/timeline/fragments/timeline.html

···

       1
       1
        
       {{ define "timeline/fragments/timeline" }}

     

       2
       2
        
           <div class="py-4">

     

       3
       3
       -
               <div class="px-6 pb-4">

     

       4
       4
       -
                   <p class="text-xl font-bold dark:text-white">Timeline</p>

     

       3
       3
       +
       

     

       4
       4
       +
                <div class="flex gap-2 px-6 pb-4">

     

       5
       5
       +
                    <div>

     

       6
       6
       +
                        <p class="text-xl font-bold dark:text-white">Timeline</p>

     

       7
       7
       +
                    </div>

     

       8
       8
       +
                    {{ if .LoggedInUser }}

     

       9
       9
       +
                    <div>

     

       10
       10
       +
                        {{ if .Filtered }}

     

       11
       11
       +
                        <a href="/timeline" class="hover:underline text-sm">

     

       12
       12
       +
                            Show All

     

       13
       13
       +
                        </a>

     

       14
       14
       +
                        {{ else }}

     

       15
       15
       +
                        <a href="/timeline?filtered=true" class="hover:underline text-sm">

     

       16
       16
       +
                         Show following only

     

       17
       17
       +
                        </a>

     

       18
       18
       +
                        {{ end }}

     

       19
       19
       +
                    </div>

     

       20
       20
       +
                    {{ end }}

     

       5
       21
        
               </div>

     

       6
       22
        
       

     

       7
       23
        
               <div class="flex flex-col gap-4">