@@ -1229,7 +1229,7 @@ func NewIssuePost(ctx *context.Context) {
12291229}
12301230
12311231// roleDescriptor returns the Role Descriptor for a comment in/with the given repo, poster and issue
1232- func roleDescriptor (ctx stdCtx.Context , repo * repo_model.Repository , poster * user_model.User , issue * issues_model.Issue , hasOriginalAuthor bool ) (issues_model.RoleDescriptor , error ) {
1232+ func roleDescriptor (ctx stdCtx.Context , repo * repo_model.Repository , poster * user_model.User , issue * issues_model.Issue , gitRepo * git. Repository , hasOriginalAuthor bool ) (issues_model.RoleDescriptor , error ) {
12331233 if hasOriginalAuthor {
12341234 return issues_model .RoleDescriptorNone , nil
12351235 }
@@ -1242,33 +1242,61 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
12421242 // By default the poster has no roles on the comment.
12431243 roleDescriptor := issues_model .RoleDescriptorNone
12441244
1245+ // If the poster is the actual poster of the issue, enable Poster role.
1246+ if issue .IsPoster (poster .ID ) {
1247+ roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorPoster )
1248+ }
1249+
12451250 // Check if the poster is owner of the repo.
12461251 if perm .IsOwner () {
12471252 // If the poster isn't a admin, enable the owner role.
12481253 if ! poster .IsAdmin {
12491254 roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorOwner )
1255+ return roleDescriptor , nil
12501256 } else {
1251-
12521257 // Otherwise check if poster is the real repo admin.
12531258 ok , err := access_model .IsUserRealRepoAdmin (repo , poster )
12541259 if err != nil {
12551260 return issues_model .RoleDescriptorNone , err
12561261 }
12571262 if ok {
12581263 roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorOwner )
1264+ return roleDescriptor , nil
12591265 }
12601266 }
12611267 }
12621268
1263- // Is the poster can write issues or pulls to the repo, enable the Writer role.
1264- // Only enable this if the poster doesn't have the owner role already.
1265- if ! roleDescriptor .HasRole ("Owner" ) && perm .CanWriteIssuesOrPulls (issue .IsPull ) {
1266- roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorWriter )
1269+ // If repo is organization, check Member role
1270+ if err := repo .LoadOwner (ctx ); err != nil {
1271+ return issues_model .RoleDescriptorNone , err
1272+ }
1273+ if repo .Owner .IsOrganization () {
1274+ if isMember , err := organization .IsOrganizationMember (ctx , repo .Owner .ID , poster .ID ); err != nil {
1275+ return issues_model .RoleDescriptorNone , err
1276+ } else if isMember {
1277+ roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorMember )
1278+ return roleDescriptor , nil
1279+ }
12671280 }
12681281
1269- // If the poster is the actual poster of the issue, enable Poster role.
1270- if issue .IsPoster (poster .ID ) {
1271- roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorPoster )
1282+ // If the poster is the collaborator of the repo
1283+ if isCollaborator , err := repo_model .IsCollaborator (ctx , repo .ID , poster .ID ); err != err {
1284+ return issues_model .RoleDescriptorNone , err
1285+ } else if isCollaborator {
1286+ roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorCollaborator )
1287+ return roleDescriptor , nil
1288+ }
1289+
1290+ if commits , err := gitRepo .SearchCommits (git.SearchCommitsOptions {
1291+ Authors : []string {poster .Name },
1292+ All : true ,
1293+ Limit : 2 ,
1294+ }); err != nil {
1295+ return issues_model .RoleDescriptorNone , err
1296+ } else if len (commits ) == 1 {
1297+ roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorContributor )
1298+ } else if len (commits ) > 1 {
1299+ roleDescriptor = roleDescriptor .WithRole (issues_model .RoleDescriptorFirstTimeContributor )
12721300 }
12731301
12741302 return roleDescriptor , nil
@@ -1526,7 +1554,7 @@ func ViewIssue(ctx *context.Context) {
15261554 // check if dependencies can be created across repositories
15271555 ctx .Data ["AllowCrossRepositoryDependencies" ] = setting .Service .AllowCrossRepositoryDependencies
15281556
1529- if issue .ShowRole , err = roleDescriptor (ctx , repo , issue .Poster , issue , issue .HasOriginalAuthor ()); err != nil {
1557+ if issue .ShowRole , err = roleDescriptor (ctx , repo , issue .Poster , issue , ctx . Repo . GitRepo , issue .HasOriginalAuthor ()); err != nil {
15301558 ctx .ServerError ("roleDescriptor" , err )
15311559 return
15321560 }
@@ -1565,7 +1593,7 @@ func ViewIssue(ctx *context.Context) {
15651593 continue
15661594 }
15671595
1568- comment .ShowRole , err = roleDescriptor (ctx , repo , comment .Poster , issue , comment .HasOriginalAuthor ())
1596+ comment .ShowRole , err = roleDescriptor (ctx , repo , comment .Poster , issue , ctx . Repo . GitRepo , comment .HasOriginalAuthor ())
15691597 if err != nil {
15701598 ctx .ServerError ("roleDescriptor" , err )
15711599 return
@@ -1664,7 +1692,7 @@ func ViewIssue(ctx *context.Context) {
16641692 continue
16651693 }
16661694
1667- c .ShowRole , err = roleDescriptor (ctx , repo , c .Poster , issue , c .HasOriginalAuthor ())
1695+ c .ShowRole , err = roleDescriptor (ctx , repo , c .Poster , issue , ctx . Repo . GitRepo , c .HasOriginalAuthor ())
16681696 if err != nil {
16691697 ctx .ServerError ("roleDescriptor" , err )
16701698 return
0 commit comments