Remove whappdc- prefix from package directory names

botcommands/whapp-bridge.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewWhappBridge(bridgeContext *core.BridgeContext) *WhappBridge {

bridge/bridge.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/hugot/go-deltachat/deltabot"
 	"github.com/hugot/whapp-deltachat/botcommands"
+	"github.com/hugot/whapp-deltachat/core"
 	"github.com/hugot/whapp-deltachat/whappdc"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
 )
 
 type Bridge struct {

main.go

@@ -7,8 +7,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	bridge "github.com/hugot/whapp-deltachat/whappdc-bridge"
+	bridge "github.com/hugot/whapp-deltachat/bridge"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func main() {

whappdc/message_handlers.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 type MessageHandler struct {

whappdc/message_tracker.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewMessageTracker(DB *core.Database, flushInterval time.Duration) *MessageTracker {

whappdc/whapp_context.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/hugot/go-deltachat/deltachat"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 func NewWhappContext(

whappdc/whapp_handler.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/Rhymen/go-whatsapp"
-	core "github.com/hugot/whapp-deltachat/whappdc-core"
+	"github.com/hugot/whapp-deltachat/core"
 )
 
 // WhappHandler implements go-whaptsapp.Handler