Merge pull request 'Ignore incoming activities which have been received before, add...

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/118

diff --cc lemmy_apub/src/lib.rs
Simple merge

diff --cc src/routes/federation.rs
Simple merge