Merge pull request #1773 from thelounge/astorije/fix-default-from

Fix default value given to `Msg.from`
2017-11-30 11:25:30 +02:00 · 2017-11-30 11:25:30 +02:00 · bdbdb69f02
commit bdbdb69f02
parent fd72179b3d c0d348a678
3 changed files with 3 additions and 3 deletions
--- a/client/views/actions/topic.tpl
+++ b/client/views/actions/topic.tpl
@ -1,4 +1,4 @@
-{{#if from}}
+{{#if from.nick}}
 	{{> ../user_name from}}
 	has changed the topic to:
 {{else}}
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@ -3,7 +3,7 @@
 		{{tz time}}
 	</span>
 	<span class="from">
-		{{#if from}}
+		{{#if from.nick}}
 			{{> user_name from}}
 		{{/if}}
 	</span>
--- a/src/models/msg.js
+++ b/src/models/msg.js
@ -7,7 +7,7 @@ var id = 0;
 class Msg {
 	constructor(attr) {
 		_.defaults(this, attr, {
-			from: "",
+			from: {},
 			id: id++,
 			previews: [],
 			text: "",