From 1313f4d2a8935d6f1e9c3452a77dce99d872937a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 31 Jan 2021 20:38:57 +0100
Subject: [PATCH] Publish doer

---
 pkg/models/events.go    | 5 ++++-
 pkg/models/listeners.go | 6 +++---
 pkg/models/tasks.go     | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/models/events.go b/pkg/models/events.go
index 6e59dd231..b48a66055 100644
--- a/pkg/models/events.go
+++ b/pkg/models/events.go
@@ -16,8 +16,11 @@
 
 package models
 
+import "code.vikunja.io/api/pkg/user"
+
 type TaskCreatedEvent struct {
 	Task *Task
+	Doer *user.User
 }
 
 func (t *TaskCreatedEvent) TopicName() string {
@@ -25,5 +28,5 @@ func (t *TaskCreatedEvent) TopicName() string {
 }
 
 func (t *TaskCreatedEvent) Message() interface{} {
-	return t.Task
+	return t
 }
diff --git a/pkg/models/listeners.go b/pkg/models/listeners.go
index 0881b87a0..790afc9e1 100644
--- a/pkg/models/listeners.go
+++ b/pkg/models/listeners.go
@@ -32,12 +32,12 @@ type SendTaskCreatedNotification struct {
 }
 
 func (s *SendTaskCreatedNotification) Handle(payload message.Payload) (err error) {
-	task := &Task{}
-	err = json.Unmarshal(payload, task)
+	event := &TaskCreatedEvent{}
+	err = json.Unmarshal(payload, event)
 	if err != nil {
 		return err
 	}
 
-	log.Debugf("task.created: %v", task)
+	log.Debugf("task.created: %v", event)
 	return nil
 }
diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index c5d78b5b9..0779a904e 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -829,7 +829,11 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
 
 	t.setIdentifier(l)
 
-	if err := events.Publish(&TaskCreatedEvent{Task: t}); err != nil {
+	err = events.Publish(&TaskCreatedEvent{
+		Task: t,
+		Doer: t.CreatedBy,
+	})
+	if err != nil {
 		return err
 	}