Added Dynamic Badge allocation if user has twitch

models/user.go

@@ -101,7 +101,6 @@ type User struct {
 	// Badges
 	IsVerified      bool
 	IsMaker         bool
-	IsStreamer      bool
 	IsBugHunter     bool
 	GitoteDeveloper bool
 
@@ -111,7 +110,7 @@ type User struct {
 	Github        string
 	Makerlog      string
 	Stackoverflow string
-	Reddit        string
+	Twitch        string
 	Telegram      string
 	Codepen       string
 	Gitlab        string

pkg/form/admin.go

@@ -45,7 +45,7 @@ type AdminEditUser struct {
 	Github           string `binding:"MaxSize(50)"`
 	Makerlog         string `binding:"MaxSize(50)"`
 	Stackoverflow    string `binding:"MaxSize(50)"`
-	Reddit           string `binding:"MaxSize(50)"`
+	Twitch           string `binding:"MaxSize(50)"`
 	Telegram         string `binding:"MaxSize(50)"`
 	Codepen          string `binding:"MaxSize(50)"`
 	Gitlab           string `binding:"MaxSize(50)"`
@@ -59,7 +59,6 @@ type AdminEditUser struct {
 	Suspended        bool
 	IsVerified       bool
 	IsMaker          bool
-	IsStreamer       bool
 	IsBugHunter      bool
 	GitoteDeveloper  bool
 	PrivateProfile   bool

pkg/form/user.go

@@ -108,7 +108,7 @@ type UpdateSocial struct {
 	Github        string `binding:"MaxSize(50)"`
 	Makerlog      string `binding:"MaxSize(50)"`
 	Stackoverflow string `binding:"MaxSize(50)"`
-	Reddit        string `binding:"MaxSize(50)"`
+	Twitch        string `binding:"MaxSize(50)"`
 	Telegram      string `binding:"MaxSize(50)"`
 	Codepen       string `binding:"MaxSize(50)"`
 	Gitlab        string `binding:"MaxSize(50)"`

routes/admin/users.go

@@ -231,7 +231,6 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	u.Suspended = f.Suspended
 	u.IsVerified = f.IsVerified
 	u.IsMaker = f.IsMaker
-	u.IsStreamer = f.IsStreamer
 	u.IsBugHunter = f.IsBugHunter
 	u.GitoteDeveloper = f.GitoteDeveloper
 	u.IsBeta = f.IsBeta
@@ -245,7 +244,7 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	u.Github = f.Github
 	u.Makerlog = f.Makerlog
 	u.Stackoverflow = f.Stackoverflow
-	u.Reddit = f.Reddit
+	u.Twitch = f.Twitch
 	u.Telegram = f.Telegram
 	u.Codepen = f.Codepen
 	u.Gitlab = f.Gitlab

routes/user/setting.go

@@ -184,7 +184,7 @@ func SettingsSocial(c *context.Context) {
 	c.Data["github"] = c.User.Github
 	c.Data["makerlog"] = c.User.Makerlog
 	c.Data["stackoverflow"] = c.User.Stackoverflow
-	c.Data["reddit"] = c.User.Reddit
+	c.Data["twitch"] = c.User.Twitch
 	c.Data["telegram"] = c.User.Telegram
 	c.Data["codepen"] = c.User.Codepen
 	c.Data["gitlab"] = c.User.Gitlab
@@ -207,7 +207,7 @@ func SettingsSocialPost(c *context.Context, f form.UpdateSocial) {
 	c.User.Github = f.Github
 	c.User.Makerlog = f.Makerlog
 	c.User.Stackoverflow = f.Stackoverflow
-	c.User.Reddit = f.Reddit
+	c.User.Twitch = f.Twitch
 	c.User.Telegram = f.Telegram
 	c.User.Codepen = f.Codepen
 	c.User.Gitlab = f.Gitlab

templates/admin/news/edit.tmpl

@@ -96,9 +96,9 @@
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.User.Stackoverflow}}">
 						</div>
-						<div class="field {{if .Err_Reddit}}error{{end}}">
-							<label for="reddit">Reddit</label>
-							<input id="reddit" name="reddit" value="{{.User.Reddit}}">
+						<div class="field {{if .Err_Twitch}}error{{end}}">
+							<label for="twitch">Twitch</label>
+							<input id="twitch" name="twitch" value="{{.User.Twitch}}">
 						</div>
 						<div class="field {{if .Err_Telegram}}error{{end}}">
 							<label for="telegram">Telegram</label>

templates/admin/user/edit.tmpl

@@ -96,9 +96,9 @@
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.User.Stackoverflow}}">
 						</div>
-						<div class="field {{if .Err_Reddit}}error{{end}}">
-							<label for="reddit">Reddit</label>
-							<input id="reddit" name="reddit" value="{{.User.Reddit}}">
+						<div class="field {{if .Err_Twitch}}error{{end}}">
+							<label for="twitch">Twitch</label>
+							<input id="twitch" name="twitch" value="{{.User.Twitch}}">
 						</div>
 						<div class="field {{if .Err_Telegram}}error{{end}}">
 							<label for="telegram">Telegram</label>
@@ -143,12 +143,6 @@
 								<input name="is_maker" type="checkbox" {{if .User.IsMaker}}checked{{end}}>
 							</div>
 						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>This account is streamer</strong> <i class="maker octicon octicon-broadcast"></i></label>
-								<input name="is_streamer" type="checkbox" {{if .User.IsStreamer}}checked{{end}}>
-							</div>
-						</div>
 						<div class="inline field">
 							<div class="ui checkbox">
 								<label><strong>This account is staff</strong> <i class="isstaff octicon octicon-tools"></i></label>

templates/admin/user/list.tmpl

@@ -37,7 +37,7 @@
 										<br/>
 										{{if .IsVerified}}<i class="admin-badge verified octicon octicon-verified"></i>{{end}}
 										{{if .IsMaker}}<i class="admin-badge maker octicon octicon-paintcan"></i>{{end}}
-										{{if .IsStreamer}}<i class="admin-badge streamer octicon octicon-broadcast"></i>{{end}}
+										{{if .Twitch}}<i class="admin-badge streamer octicon octicon-broadcast"></i>{{end}}
 										{{if .IsBugHunter}}<i class="admin-badge bughunter octicon octicon-gist-secret"></i>{{end}}
 										{{if .IsBeta}}<i class="admin-badge developer octicon octicon-circuit-board"></i>{{end}}
 										{{if .IsStaff}}<i class="admin-badge isstaff octicon octicon-tools"></i>{{end}}

templates/user/profile.tmpl

@@ -74,7 +74,7 @@
 				{{if .Owner.GitoteDeveloper}}<img class="ui image" src="https://cdn.gitote.in/img/badges/gitotedeveloper.png">{{end}}
 				{{if .Owner.IsBeta}}<img class="ui image" src="https://cdn.gitote.in/img/badges/beta.png">{{end}}
 				{{if .Owner.IsMaker}}<img class="ui image" src="https://cdn.gitote.in/img/badges/maker.png">{{end}}
-				{{if .Owner.IsStreamer}}<img class="ui image" src="https://cdn.gitote.in/img/badges/streamer.png">{{end}}
+				{{if .Owner.Twitch}}<img class="ui image" src="https://cdn.gitote.in/img/badges/streamer.png">{{end}}
 				{{if .Owner.IsBugHunter}}<img class="ui image" src="https://cdn.gitote.in/img/badges/bughunter.png">{{end}}
 			</div>
 		{{end}}
@@ -137,14 +137,14 @@
 									<p style="font-weight:500">{{.Owner.Status}}</p>
 								</li>
 							{{end}}
-							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Makerlog .Owner.Stackoverflow .Owner.Reddit .Owner.Telegram .Owner.Codepen}}
+							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Makerlog .Owner.Stackoverflow .Owner.Twitch .Owner.Telegram .Owner.Codepen}}
 								<li class="ui center">
 									{{if .Owner.Twitter}}<a href="https://twitter.com/{{.Owner.Twitter}}" target="_blank"><i class="twitter icon"></i></a>{{end}}
 									{{if .Owner.Linkedin}}<a href="https://linkedin.com/in/{{.Owner.Linkedin}}" target="_blank"><i class="linkedin icon"></i></a>{{end}}
 									{{if .Owner.Github}}<a href="https://github.com/{{.Owner.Github}}" target="_blank"><i class="github icon"></i></a>{{end}}
 									{{if .Owner.Makerlog}}<a href="https://getmakerlog.com/@{{.Owner.Makerlog}}" target="_blank"><i class="check circle icon"></i></a>{{end}}
 									{{if .Owner.Stackoverflow}}<a href="https://stackoverflow.com/users/{{.Owner.Stackoverflow}}" target="_blank"><i class="stack overflow icon"></i></a>{{end}}
-									{{if .Owner.Reddit}}<a href="https://reddit.com/user/{{.Owner.Reddit}}" target="_blank"><i class="reddit icon"></i></a>{{end}}
+									{{if .Owner.Twitch}}<a href="https://www.twitch.tv/{{.Owner.Twitch}}" target="_blank"><i class="twitch icon"></i></a>{{end}}
 									{{if .Owner.Telegram}}<a href="https://t.me/{{.Owner.Telegram}}" target="_blank"><i class="telegram icon"></i></a>{{end}}
 									{{if .Owner.Codepen}}<a href="https://codepen.io/{{.Owner.Codepen}}" target="_blank"><i class="codepen icon"></i></a>{{end}}
 									{{if .Owner.Gitlab}}<a href="https://gitlab.com/{{.Owner.Gitlab}}" target="_blank"><i class="gitlab icon"></i></a>{{end}}
@@ -204,7 +204,7 @@
 									{{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}}
 								</a>
 							</li>
-							{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.IsMaker .Owner.IsStreamer .Owner.IsBugHunter}}
+							{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.IsMaker .Owner.Twitch .Owner.IsBugHunter}}
 								<li>
 									<div class="ui tiny images">
 										{{if .Owner.GitoteDeveloper}}
@@ -222,7 +222,7 @@
 												<img class="ui image" src="https://cdn.gitote.in/img/badges/maker.png">
 											</a>
 										{{end}}
-										{{if .Owner.IsStreamer}}
+										{{if .Owner.Twitch}}
 											<a class="poping up" target="_blank" href="/streamer" data-content="Streamer" data-variation="inverted tiny" data-position="left center">
 												<img class="ui image" src="https://cdn.gitote.in/img/badges/streamer.png">
 											</a>

templates/user/settings/social.tmpl

@@ -37,8 +37,8 @@
 							<input id="stackoverflow" name="stackoverflow" value="{{.stackoverflow}}"  placeholder="id/username">
 						</div>
 						<div class="field">
-							<label for="reddit">Reddit</label>
-							<input id="reddit" name="reddit" value="{{.reddit}}"  placeholder="username">
+							<label for="twitch">Twitch</label>
+							<input id="twitch" name="twitch" value="{{.twitch}}"  placeholder="username">
 						</div>
 						<div class="field">
 							<label for="telegram">Telegram</label>